| commit | 1b810a5706cc5ba29ac59df15a09101587468c7c | [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 | cdfaef1e9642f18242954159d3b1c8a32f5b0663 | |
| parent | 15e26dca2bbf167bb0cd09a8b0f1a45499320607 [diff] | |
| parent | 88196464e91dd533f2dd28a02f55b7e4801eead0 [diff] |
am 88196464: (-s ours) am 4d69ac66: Merge "DO NOT MERGE" into eclair Merge commit '88196464e91dd533f2dd28a02f55b7e4801eead0' * commit '88196464e91dd533f2dd28a02f55b7e4801eead0': DO NOT MERGE