OSDN Git Service

Merge "tests: don\'t use bt_os_callouts for wakelocks" am: c61db8d557
authorMarie Janssen <jamuraa@google.com>
Wed, 2 Dec 2015 23:09:12 +0000 (23:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 2 Dec 2015 23:09:12 +0000 (23:09 +0000)
am: 46c04cbc59  -s ours

* commit '46c04cbc5992eb3d379363ab5e4ccb7d47ec498a':
  tests: don't use bt_os_callouts for wakelocks


Trivial merge