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)
commit9fd993efb978e1f24406db5bb5f0024e9f2c32a4
treea7478bd7dcc652c67ed42e2f4597e36a8f8bb057
parent49aec4ef9a0224da7d463db7d16be03bcf1562c1
parent46c04cbc5992eb3d379363ab5e4ccb7d47ec498a
Merge "tests: don\'t use bt_os_callouts for wakelocks" am: c61db8d557
am: 46c04cbc59  -s ours

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