Merge "Introduce DISALLOW_BLUETOOTH_SHARING."

author Pavel Grafov <pgrafov@google.com>

Wed, 12 Apr 2017 10:17:13 +0000 (10:17 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Wed, 12 Apr 2017 10:17:19 +0000 (10:17 +0000)
author Pavel Grafov <pgrafov@google.com>
Wed, 12 Apr 2017 10:17:13 +0000 (10:17 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 12 Apr 2017 10:17:19 +0000 (10:17 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
author	Pavel Grafov <pgrafov@google.com>
	Wed, 12 Apr 2017 10:17:13 +0000 (10:17 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 12 Apr 2017 10:17:19 +0000 (10:17 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history