| commit | 2cbe35e5b24ecbdbd114248b1fb8010926d80567 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 08:22:15 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 08:22:15 2010 -0800 |
| tree | 00f298e7a2c5d5f9fac045342cf88007b7338dfe | |
| parent | c66f7d2ff87d3276d2a369bb8b88a617b544203a [diff] | |
| parent | 663c39d4fd672cd52ca852d0717bfec955ebfa98 [diff] |
am 663c39d4: reconcile main tree with open-source eclair Merge commit '663c39d4fd672cd52ca852d0717bfec955ebfa98' into eclair-plus-aosp * commit '663c39d4fd672cd52ca852d0717bfec955ebfa98': android-2.1_r1 snapshot