| commit | 0dd458e65ab537a7a961e54257dcb77628ec3789 | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@google.com> | Sun Oct 10 12:51:28 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Oct 10 12:51:28 2010 -0700 |
| tree | a03292d524eaffce6cddcc9a9282c3a0e3c38f72 | |
| parent | eef1d7d422ac85a8b4de9a9ef1415c8537f33406 [diff] | |
| parent | 99185c2a462d563855e4bc0c1e5649a21b2e186b [diff] |
am 99185c2a: am cd7170d7: resolved conflicts for merge of 0f8fcbe2 to gingerbread Merge commit '99185c2a462d563855e4bc0c1e5649a21b2e186b' * commit '99185c2a462d563855e4bc0c1e5649a21b2e186b': Support Additional CTS Host Jars