| commit | 80e9d69a5a1da96e57aed66ced3899484b129cde | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:08:34 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:08:34 2010 -0800 |
| tree | 13a805bb9a987c3a6596a0336c4827aa156d8027 | |
| parent | 619ec148c178c95ca57870e0486456251fecabb8 [diff] | |
| parent | 2cbe35e5b24ecbdbd114248b1fb8010926d80567 [diff] |
am 2cbe35e5: am 663c39d4: reconcile main tree with open-source eclair Merge commit '2cbe35e5b24ecbdbd114248b1fb8010926d80567' * commit '2cbe35e5b24ecbdbd114248b1fb8010926d80567': android-2.1_r1 snapshot