OSDN Git Service

Merge "Bluetooth: mLocalAdapter should never be null" into oc-dr1-dev
authorJack He <siyuanh@google.com>
Tue, 11 Jul 2017 21:22:40 +0000 (21:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 11 Jul 2017 21:22:40 +0000 (21:22 +0000)
am: 86fd147ac6

Change-Id: Ib56a1d03e9e74632137117802a5baab3870947bb


Trivial merge