| commit | 67bebd06dfa7b4f94520ea2623f1d76e2a28a186 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 08:46:28 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 08:46:28 2010 -0800 |
| tree | a85323ea0e3877e33820b86a7dea696d32c7a034 | |
| parent | a06e92b245a3d0061731f26ed2daf2fbf3ebf9ea [diff] | |
| parent | 0749a3f1c11e052f97a3ba60fd624c9283ee7331 [diff] |
am 0749a3f1: reconcile main tree with open-source eclair Merge commit '0749a3f1c11e052f97a3ba60fd624c9283ee7331' into eclair-plus-aosp * commit '0749a3f1c11e052f97a3ba60fd624c9283ee7331': android-2.1_r1 snapshot