| commit | 7b1211d28fc02f0fd24a9febeaae1e58da764f31 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 08:47:07 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 08:47:07 2010 -0800 |
| tree | 0fb281d1f2c9b5983c59359c272e6eb8cf4826b5 | |
| parent | 757b902d7fc0be2f82815d0846c12a1e66030bf4 [diff] | |
| parent | 070076603b2f7e260e2f198695432dbd9bcce5d9 [diff] |
am 07007660: reconcile main tree with open-source eclair Merge commit '070076603b2f7e260e2f198695432dbd9bcce5d9' into eclair-plus-aosp * commit '070076603b2f7e260e2f198695432dbd9bcce5d9': android-2.1_r1 snapshot