OSDN Git Service

resolve merge conflicts of c816141 to nyc-mr1-dev-plus-aosp
authorMarie Janssen <jamuraa@google.com>
Thu, 29 Dec 2016 22:05:47 +0000 (14:05 -0800)
committerMarie Janssen <jamuraa@google.com>
Thu, 29 Dec 2016 22:05:47 +0000 (14:05 -0800)
commit07e590a574de4a103418a319ab38986cbefb8ac7
tree1f1abceb3abcab47794717612b92935e2d351aa1
parente11c3f6657cb70a86c5b322b3c017f229e751f3b
parentc816141bceb61d8f5a4e6aa6067c61f97a02efba
resolve merge conflicts of c816141 to nyc-mr1-dev-plus-aosp

Change-Id: I42e00b90165220d88519771b8f4280aaf3a07525
core/java/android/bluetooth/BluetoothAdapter.java
services/core/java/com/android/server/BluetoothManagerService.java