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

Commit f182cabc authored by Hemal Patel's avatar Hemal Patel Committed by android-build-merger
Browse files

resolve merge conflicts of a544221 to nyc-dev-plus-aosp am: 7183caa2 

am: be30a51a

Change-Id: Ia3bb6a624d0696a630df48073bd87595504b4ae1
parents 8779179b be30a51a

framework/java/android/bluetooth/BluetoothAdapter.java

+5 −2
Original line number Diff line number Diff line
@@ -90,8 +90,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