OSDN Git Service

resolve merge conflicts of 0a5d9ebb0b15976b47eaff77bb66a257b8b114bb to stage-aosp...
authorJakub Pawlowski <jpawlowski@google.com>
Wed, 9 Aug 2017 07:44:01 +0000 (00:44 -0700)
committerJakub Pawlowski <jpawlowski@google.com>
Wed, 9 Aug 2017 08:56:34 +0000 (08:56 +0000)
commitca61556a761ea6f9581782768222336e518f0d16
tree0cb9ebab8504f68415e436721ac9e43e54ab1e1c
parent0cc11eea1211ee87395d7e81d618a9dcc5ae9456
resolve merge conflicts of 0a5d9ebb0b15976b47eaff77bb66a257b8b114bb to stage-aosp-master

Test: this fixes merge conflict that I skipped
Change-Id: Ie829182b01d01e5ae648165f30cfad7647a97db6
Merged-In: Ie829182b01d01e5ae648165f30cfad7647a97db5
binder/android/bluetooth/IBluetoothA2dp.aidl
binder/android/bluetooth/IBluetoothGatt.aidl
binder/android/bluetooth/IBluetoothHeadset.aidl
binder/android/bluetooth/IBluetoothManager.aidl
binder/android/bluetooth/IBluetoothProfileServiceConnection.aidl