tree 8fd4eb55acfe00f00bbe22fc034f5b931a8201ac
parent 0abd4c2238a04f3064ffcbcf662bf225173ea556
parent cfba316c529471af6072d836957d06496cc1b554
author Dmitry Grinberg <dmitrygr@google.com> 1400880678 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1400880679 +0000

Merge "Provide bluedroid with wakelock access as a temporary fix" into klp-modular-dev