diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-08-24 10:16:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-24 10:16:28 -0700 |
| commit | a39b44f19b1ac4a28fe2cdc76311ab1c6e6af92d (patch) | |
| tree | 88f7f037cbf973f78aafbbcb16dff41278d51d0a /framework/java/android/bluetooth/BluetoothDevicePicker.java | |
| parent | 43d545da140ca23a0f95875449dd2b56dc0dc8dc (diff) | |
| parent | 4b6b4827b6c7825a3b18f9051c262d3c94acb1e8 (diff) | |
am 4b6b4827: manual merge
Merge commit '4b6b4827b6c7825a3b18f9051c262d3c94acb1e8'
* commit '4b6b4827b6c7825a3b18f9051c262d3c94acb1e8':
BluetoothHeadset.java:
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothDevicePicker.java')
0 files changed, 0 insertions, 0 deletions