| commit | cb1aa7c966a9aeb4c4161609310d5edda53b8356 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:12:51 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:12:51 2010 -0800 |
| tree | 37431f72c3f180a50989f3bfc4c7c43909c8e02d | |
| parent | 7a1162dc4d9f2364450ec294619e0c524480bc24 [diff] | |
| parent | adbe0586957a71d2aa9f100646882dbca1c78f12 [diff] |
am adbe0586: am 217f8ef4: reconcile main tree with open-source eclair Merge commit 'adbe0586957a71d2aa9f100646882dbca1c78f12' * commit 'adbe0586957a71d2aa9f100646882dbca1c78f12': android-2.1_r1 snapshot