diff options
| author | Jake Hamby <jhamby@google.com> | 2010-09-30 16:29:13 -0700 |
|---|---|---|
| committer | Jake Hamby <jhamby@google.com> | 2010-09-30 16:29:13 -0700 |
| commit | c242248fe9ec993dad34c81f88747bfdebe329aa (patch) | |
| tree | 17a7e9bda8fdb3df05f274c45b9e8fa395325c0b /framework/java/android/bluetooth/BluetoothClass.java | |
| parent | a41d275138f30a3b0e65e6a2b5c0d485da40cc0c (diff) | |
| parent | 04c7138c7c1f36d54fbe33c40644e197248166b9 (diff) | |
resolved conflicts for merge of 0a972acf to gingerbread-plus-aosp
Change-Id: Id8dc5038edc214b4433bdf690243f2f5fe5b4812
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothClass.java')
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothClass.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/framework/java/android/bluetooth/BluetoothClass.java b/framework/java/android/bluetooth/BluetoothClass.java index c7fea9e1da..6a878d73e2 100644 --- a/framework/java/android/bluetooth/BluetoothClass.java +++ b/framework/java/android/bluetooth/BluetoothClass.java @@ -34,8 +34,8 @@ import android.os.Parcelable; * Bluetooth profiles or services are actually supported by a device. Accurate * service discovery is done through SDP requests, which are automatically * performed when creating an RFCOMM socket with {@link - * BluetoothDevice#createRfcommSocketToServiceRecord(UUID)} and {@link - * BluetoothAdapter#listenUsingRfcommWithServiceRecord(String,UUID)}</p> + * BluetoothDevice#createRfcommSocketToServiceRecord} and {@link + * BluetoothAdapter#listenUsingRfcommWithServiceRecord}</p> * * <p>Use {@link BluetoothDevice#getBluetoothClass} to retrieve the class for * a remote device. |