| commit | 9bc544890c132d251f2c85c7ff283d245fd2fd9d | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@google.com> | Fri Aug 12 17:37:31 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 12 17:37:31 2011 -0700 |
| tree | dabef7d9ec96ad8264b95f0f2f5c032abac2f4e4 | |
| parent | b564b2295353fa68f6e6a18a201e60cbf5325f1e [diff] | |
| parent | 8def0f46d1fa58d032931db6a6f242672f870158 [diff] |
am 8def0f46: resolved conflicts for merge of ad892b2c to honeycomb-plus-aosp * commit '8def0f46d1fa58d032931db6a6f242672f870158': CTS Verifier Packaging and Versioning