tree a1a7ac298b07ad839fc37e5894dad2089e83673a
parent d4a9573bd3728a338b4504de8874fcc034b5bd3f
parent 3e9b45690b6bad264acfbb7d6b0321383dba0654
author Aravind Akella <aakella@google.com> 1402087894 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1402087894 +0000

Merge "DO NOT MERGE SensorBatching CTS test, add wakelock and increase timeouts" into klp-modular-dev