Merge tag 'android-5.1.0_r1' into HEAD
Android 5.1.0 release 1 Conflicts: src/com/android/bluetooth/btservice/AdapterService.java src/com/android/bluetooth/gatt/AdvertiseManager.java src/com/android/bluetooth/gatt/ScanManager.java src/com/android/bluetooth/hfp/HeadsetPhoneState.java src/com/android/bluetooth/hfp/HeadsetStateMachine.java src/com/android/bluetooth/map/BluetoothMapContent.java src/com/android/bluetooth/map/BluetoothMapContentObserver.java src/com/android/bluetooth/map/BluetoothMapEmailSettingsLoader.java src/com/android/bluetooth/map/BluetoothMapObexServer.java src/com/android/bluetooth/map/BluetoothMapService.java src/com/android/bluetooth/opp/BluetoothOppIncomingFileConfirmActivity.java src/com/android/bluetooth/opp/BluetoothOppService.java src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java Change-Id: Ic7a754ea29d6124d7e53b6f13eed181d3f7e64e5
Loading
Please register or sign in to comment