| commit | adbe0586957a71d2aa9f100646882dbca1c78f12 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 08:40:23 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 08:40:23 2010 -0800 |
| tree | e34e6f36287bcfb160fc3cd6c2f6409a61387fa2 | |
| parent | ffea5cebcb45bb58d61b903f4e04c45f48442c86 [diff] | |
| parent | 217f8ef4c1c151c63382dc0785edd960c233f62e [diff] |
am 217f8ef4: reconcile main tree with open-source eclair Merge commit '217f8ef4c1c151c63382dc0785edd960c233f62e' into eclair-plus-aosp * commit '217f8ef4c1c151c63382dc0785edd960c233f62e': android-2.1_r1 snapshot