| commit | 338d92c74ea2b300c60d56a00be7cf465d74571f | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:08:31 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:08:31 2010 -0800 |
| tree | b97dc06c489208e5179a468c5e23a96d82bb5ff2 | |
| parent | bc4f473094597b9c40c7c99ea8c9fdf74187eca8 [diff] | |
| parent | b3c80626606fd3cad8df7e34d48832bddaead8cd [diff] |
am b3c80626: am a72b3934: reconcile main tree with open-source eclair Merge commit 'b3c80626606fd3cad8df7e34d48832bddaead8cd' * commit 'b3c80626606fd3cad8df7e34d48832bddaead8cd': android-2.1_r1 snapshot