diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-09-13 11:51:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-13 11:51:55 -0700 |
| commit | 4de4f09e8ed95255c1077cfbbaf018877221455d (patch) | |
| tree | af44d484d2bf162bff4bd1732bc509c3f9449f2c /core/jni/android_server_BluetoothService.cpp | |
| parent | 4d9878502f7661ed34540a485a5942d859e209c7 (diff) | |
| parent | fbd2646705c52c111f041b16d7cb34cb922a2a64 (diff) | |
| download | frameworks_base-4de4f09e8ed95255c1077cfbbaf018877221455d.zip frameworks_base-4de4f09e8ed95255c1077cfbbaf018877221455d.tar.gz frameworks_base-4de4f09e8ed95255c1077cfbbaf018877221455d.tar.bz2 | |
am fbd26467: Merge "DO NOT MERGE" into gingerbread
Merge commit 'fbd2646705c52c111f041b16d7cb34cb922a2a64' into gingerbread-plus-aosp
* commit 'fbd2646705c52c111f041b16d7cb34cb922a2a64':
DO NOT MERGE
Diffstat (limited to 'core/jni/android_server_BluetoothService.cpp')
0 files changed, 0 insertions, 0 deletions