Merge "Introduce system APIs for Bluetooth silence mode." am: d17b284bdb

author Ugo Yu <ugoyu@google.com>

Thu, 24 Jan 2019 18:37:47 +0000 (10:37 -0800)

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

Thu, 24 Jan 2019 18:37:47 +0000 (10:37 -0800)
author Ugo Yu <ugoyu@google.com>
Thu, 24 Jan 2019 18:37:47 +0000 (10:37 -0800)
committer android-build-merger <android-build-merger@google.com>
Thu, 24 Jan 2019 18:37:47 +0000 (10:37 -0800)
diff --cc api/system-current.txt
Simple merge
diff --cc core/java/android/bluetooth/BluetoothDevice.java
Simple merge
author	Ugo Yu <ugoyu@google.com>
	Thu, 24 Jan 2019 18:37:47 +0000 (10:37 -0800)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 24 Jan 2019 18:37:47 +0000 (10:37 -0800)
		1	2
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/bluetooth/BluetoothDevice.java	patch \|	diff1 \|	diff2 \|	blob \| history