| commit | 2d3353be64c34a8ed7c0c75a739e48b517c361e6 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 08:49:36 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 08:49:36 2010 -0800 |
| tree | b98e2b81198a37bacd603c2328eddfa2d26f8d24 | |
| parent | 90e6532e3531d1fff8598c7353abac939c102266 [diff] | |
| parent | 04f4c51c1f00921d5e32c0bf31a3565916b70b07 [diff] |
am 04f4c51c: reconcile main tree with open-source eclair Merge commit '04f4c51c1f00921d5e32c0bf31a3565916b70b07' into eclair-plus-aosp * commit '04f4c51c1f00921d5e32c0bf31a3565916b70b07': android-2.1_r1 snapshot