MAP MCE am: 631768d814

author Joseph Pirozzo <pirozzoj@google.com>

Wed, 2 Nov 2016 01:09:14 +0000 (01:09 +0000)

committer android-build-merger <android-build-merger@google.com>

Wed, 2 Nov 2016 01:09:14 +0000 (01:09 +0000)
author Joseph Pirozzo <pirozzoj@google.com>
Wed, 2 Nov 2016 01:09:14 +0000 (01:09 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 2 Nov 2016 01:09:14 +0000 (01:09 +0000)
diff --cc Android.mk
Simple merge
diff --cc core/java/android/bluetooth/BluetoothAdapter.java
Simple merge
diff --cc core/java/android/provider/Settings.java
Simple merge
author	Joseph Pirozzo <pirozzoj@google.com>
	Wed, 2 Nov 2016 01:09:14 +0000 (01:09 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 2 Nov 2016 01:09:14 +0000 (01:09 +0000)
		1	2
Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/bluetooth/BluetoothAdapter.java	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/provider/Settings.java	patch \|	diff1 \|	diff2 \|	blob \| history