Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7183caa2 authored Aug 25, 2016 by Hemal Patel

resolve merge conflicts of a544221 to nyc-dev-plus-aosp

Change-Id: Ie7a3a85fdd2e59eea4f74760010190ce9f5f9b02

parents 4c1c9089 e2cf8678

framework/java/android/bluetooth/BluetoothAdapter.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -89,8 +89,11 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
		*
		* <div class="special reference">
		* <h3>Developer Guides</h3>
		* <p>For more information about using Bluetooth, read the
		* <a href="{@docRoot}guide/topics/connectivity/bluetooth.html">Bluetooth</a> developer guide.
		* <p>
		* For more information about using Bluetooth, read the <a href=
		* "{@docRoot}guide/topics/connectivity/bluetooth.html">Bluetooth</a> developer
		* guide.
		* </p>
		* </div>
		*
		* {@see BluetoothDevice}

framework/java/android/bluetooth/BluetoothDevice.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -59,8 +59,11 @@ import java.util.UUID;
		*
		* <div class="special reference">
		* <h3>Developer Guides</h3>
		* <p>For more information about using Bluetooth, read the
		* <a href="{@docRoot}guide/topics/connectivity/bluetooth.html">Bluetooth</a> developer guide.</p>
		* <p>
		* For more information about using Bluetooth, read the <a href=
		* "{@docRoot}guide/topics/connectivity/bluetooth.html">Bluetooth</a> developer
		* guide.
		* </p>
		* </div>
		*
		* {@see BluetoothAdapter}

framework/java/android/bluetooth/BluetoothManager.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -38,8 +38,11 @@ import java.util.List;
		*
		* <div class="special reference">
		* <h3>Developer Guides</h3>
		* <p>For more information about using BLUETOOTH, read the
		* <a href="{@docRoot}guide/topics/connectivity/bluetooth.html">Bluetooth</a> developer guide.</p>
		* <p>
		* For more information about using BLUETOOTH, read the <a href=
		* "{@docRoot}guide/topics/connectivity/bluetooth.html">Bluetooth</a> developer
		* guide.
		* </p>
		* </div>
		*
		* @see Context#getSystemService