tree 27143a82e054d6c35cfddc141f8e6f4ec8d6c793
parent bfb222069971808621cf0e1fd80584eca7372060
parent d0ff89bb19edc1bb2ba4bfe5077328fa56852e57
author Dmitry Grinberg <dmitrygr@google.com> 1400881562 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400881562 +0000

am d0ff89bb: am 99b5e99f: Merge "Provide bluedroid with wakelock access as a temporary fix" into klp-modular-dev

* commit 'd0ff89bb19edc1bb2ba4bfe5077328fa56852e57':
  Provide bluedroid with wakelock access as a temporary fix