diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2011-07-14 10:55:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-14 10:55:55 -0700 |
| commit | 917c583ba7cb588da329e5044f8f855c481fb0be (patch) | |
| tree | bcd7870a8bf3b4d16c53ab6cbce39843c1257280 /framework/java/android/bluetooth/BluetoothAdapter.java | |
| parent | ba03884aab6f9df2e270f36398d0fc461db2761d (diff) | |
| parent | e2d786b3ba0d838215360b9eefff8cd91b68636a (diff) | |
am e2d786b3: (-s ours) resolved conflicts for merge of ab3ec176 to honeycomb-plus-aosp
* commit 'e2d786b3ba0d838215360b9eefff8cd91b68636a':
Bluetooth: correcting return value from cancelDiscovery
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothAdapter.java')
0 files changed, 0 insertions, 0 deletions