commit ee8d336046ed27dd0a0bda5b3ce3cb62ccb1f322
author B--B <dark.schneider.ds@gmail.com> Tue Dec 06 19:38:10 2016 +0100
committer B--B <dark.schneider.ds@gmail.com> Tue Dec 06 19:38:10 2016 +0100
tree f7f1206b3e9586b5b3b370a95905f76be39efd3c
parent b08e92d55b9d4956d9ce124e2956a5f28bbe0205
parent 2d03e3e3c4568e09a7e30b2bc99def0cd34b8f97

Merge tag 'android-7.1.0_r7' into aosp-7.1

Android 7.1.0 release 7

Conflicts:
	src/com/android/bluetooth/avrcp/Avrcp.java
	src/com/android/bluetooth/btservice/AdapterService.java
	src/com/android/bluetooth/btservice/RemoteDevices.java
	src/com/android/bluetooth/hfp/HeadsetStateMachine.java
	src/com/android/bluetooth/map/BluetoothMapContentObserver.java
	src/com/android/bluetooth/map/BluetoothMapService.java
	src/com/android/bluetooth/opp/BluetoothOppSendFileInfo.java
	src/com/android/bluetooth/pan/PanService.java