OSDN Git Service

resolve merge conflicts of 9cc7ebe to stage-aosp-master
authorMarie Janssen <jamuraa@google.com>
Thu, 29 Dec 2016 20:16:34 +0000 (12:16 -0800)
committerMarie Janssen <jamuraa@google.com>
Thu, 29 Dec 2016 20:44:03 +0000 (12:44 -0800)
commitc816141bceb61d8f5a4e6aa6067c61f97a02efba
tree49f15014d243ccb71c7ec577eb0f934e84e1a082
parent59d63e8b1d99ec7f90cc425b5d3908d05e14dcba
parent9cc7ebe7d90c8da1340c8115023bd38451e58f7e
resolve merge conflicts of 9cc7ebe to stage-aosp-master

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