Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: Ie7a3a85fdd2e59eea4f74760010190ce9f5f9b02
This commit is contained in:
Hemal Patel
2016-08-25 16:53:49 -07:00
parent 0fd07c4e79 a544221abd
commit 309813c8af
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/bluetooth/BluetoothAdapter.java
View File

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

7
core/java/android/bluetooth/BluetoothDevice.java
View File

@@ -59,8 +59,11 @@ import java.util.UUID;
* *
* <div class="special reference"> * <div class="special reference">
* <h3>Developer Guides</h3> * <h3>Developer Guides</h3>
* <p>For more information about using Bluetooth, read the * <p>
* <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> * </div>
* *
* {@see BluetoothAdapter} * {@see BluetoothAdapter}

7
core/java/android/bluetooth/BluetoothManager.java
View File

@@ -38,8 +38,11 @@ import java.util.List;
* *
* <div class="special reference"> * <div class="special reference">
* <h3>Developer Guides</h3> * <h3>Developer Guides</h3>
* <p>For more information about using BLUETOOTH, read the * <p>
* <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> * </div>
* *
* @see Context#getSystemService * @see Context#getSystemService