| commit | 614a1627666038811e25269a53dc67167cec26d5 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:17:07 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:17:07 2010 -0800 |
| tree | 3767a50c567dd7de210c425505a0e3eb6572c3bf | |
| parent | 661f9634b51c200603b32224541327d50808ba65 [diff] | |
| parent | f73c044f4fd4e8f51fcb0aa93e5a79e9e4f10b25 [diff] |
am f73c044f: am d34d5cc5: reconcile main tree with open-source eclair Merge commit 'f73c044f4fd4e8f51fcb0aa93e5a79e9e4f10b25' * commit 'f73c044f4fd4e8f51fcb0aa93e5a79e9e4f10b25': android-2.1_r1 snapshot