Merge "Make Bluetooth constants used by gmscore a system api"

author Treehugger Robot <treehugger-gerrit@google.com>

Thu, 11 Jan 2018 20:22:05 +0000 (20:22 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Thu, 11 Jan 2018 20:22:05 +0000 (20:22 +0000)
author Treehugger Robot <treehugger-gerrit@google.com>
Thu, 11 Jan 2018 20:22:05 +0000 (20:22 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 11 Jan 2018 20:22:05 +0000 (20:22 +0000)
diff --cc api/system-current.txt
Simple merge
diff --cc core/java/android/bluetooth/BluetoothHeadset.java
Simple merge
author	Treehugger Robot <treehugger-gerrit@google.com>
	Thu, 11 Jan 2018 20:22:05 +0000 (20:22 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Thu, 11 Jan 2018 20:22:05 +0000 (20:22 +0000)
		1	2
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/bluetooth/BluetoothHeadset.java	patch \|	diff1 \|	diff2 \|	blob \| history