| commit | 834081811a9cecd98fb15f309e3d040702d1c071 | [log] [tgz] |
|---|---|---|
| author | Grace Kloba <klobag@google.com> | Thu Jan 21 14:32:01 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 21 14:32:01 2010 -0800 |
| tree | aa64093317df178cde7b8252e600039826e7f7bd | |
| parent | 01627527e5193a60f82c5740c9764257db9736eb [diff] | |
| parent | 9e29d82925f83233263ac4b245f93c4f47d6618a [diff] |
am 88196464: (-s ours) am 4d69ac66: Merge "DO NOT MERGE" into eclair Merge commit '88196464e91dd533f2dd28a02f55b7e4801eead0' * commit '88196464e91dd533f2dd28a02f55b7e4801eead0': DO NOT MERGE