OSDN Git Service

am b3ca1b37: resolved conflicts for merge of a905eb62 to mnc-dr-dev-plus-aosp
authorSharvil Nanavati <sharvil@google.com>
Fri, 4 Sep 2015 02:25:30 +0000 (02:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 4 Sep 2015 02:25:30 +0000 (02:25 +0000)
commit2f86b2fc188edb0ba50483e624bd982a594c6633
tree33ec6c7c2a472866b52fa2aa887224ced8e7e19d
parent15c3ad9c08b864f63ed2581a10a65107fbe04752
parentb3ca1b3756cb8682045456526aee924cd0290da5
am b3ca1b37: resolved conflicts for merge of a905eb62 to mnc-dr-dev-plus-aosp

* commit 'b3ca1b3756cb8682045456526aee924cd0290da5':
  DO NOT MERGE Directly acquire wake locks from the Bluetooth stack.