| commit | 64f6d1f2ee0563cb8cffaf3ceeeab7393538cf31 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 08:47:17 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 08:47:17 2010 -0800 |
| tree | 71fd6f46efdbb3877535bdb578cd8c58bd674977 | |
| parent | 2a7411dc92f15111e36f72214216f96aab2c51f9 [diff] | |
| parent | 358c03ff70ce697f4b6d57cc048c0c37b5feb3b8 [diff] |
am 358c03ff: reconcile main tree with open-source eclair Merge commit '358c03ff70ce697f4b6d57cc048c0c37b5feb3b8' into eclair-plus-aosp * commit '358c03ff70ce697f4b6d57cc048c0c37b5feb3b8': android-2.1_r1 snapshot