diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-09-13 14:43:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-13 14:43:16 -0700 |
| commit | b6b81f5f39f5ff5b8530717b4c015ef31d43e5d4 (patch) | |
| tree | 7b9e8d58de7225250c6374b51591237067b6d7bc /core/java/android/bluetooth/BluetoothAdapter.java | |
| parent | e931c68f53ffca710270f26a21387e482a88e1e3 (diff) | |
| parent | 4de4f09e8ed95255c1077cfbbaf018877221455d (diff) | |
| download | frameworks_base-b6b81f5f39f5ff5b8530717b4c015ef31d43e5d4.zip frameworks_base-b6b81f5f39f5ff5b8530717b4c015ef31d43e5d4.tar.gz frameworks_base-b6b81f5f39f5ff5b8530717b4c015ef31d43e5d4.tar.bz2 | |
am 4de4f09e: (-s ours) am fbd26467: Merge "DO NOT MERGE" into gingerbread
Merge commit '4de4f09e8ed95255c1077cfbbaf018877221455d'
* commit '4de4f09e8ed95255c1077cfbbaf018877221455d':
DO NOT MERGE
Diffstat (limited to 'core/java/android/bluetooth/BluetoothAdapter.java')
0 files changed, 0 insertions, 0 deletions