| commit | 9df17a63e52390bd56b955611cdde28ca8e231ef | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 08:46:03 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 08:46:03 2010 -0800 |
| tree | be2111362168dfba48fec33eb211c3c63ea0ce96 | |
| parent | 5b739d8102982d24924aae0dbbb74b9fbc1c46ae [diff] | |
| parent | 066e5308dc23b17b3f50ab3459b06ae6ec4bc12a [diff] |
am 066e5308: reconcile main tree with open-source eclair Merge commit '066e5308dc23b17b3f50ab3459b06ae6ec4bc12a' into eclair-plus-aosp * commit '066e5308dc23b17b3f50ab3459b06ae6ec4bc12a': android-2.1_r1 snapshot