| commit | 99185c2a462d563855e4bc0c1e5649a21b2e186b | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@google.com> | Thu Oct 07 15:48:15 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 07 15:48:15 2010 -0700 |
| tree | c04982fcbbc3d5e3fc3c2a0a49b80045bfc512e9 | |
| parent | 547b902e990fcb3c3e09ef464f3eebd9368c6c77 [diff] | |
| parent | cd7170d7ee81d1be9e5c93e9e372e2b58fe5d959 [diff] |
am cd7170d7: resolved conflicts for merge of 0f8fcbe2 to gingerbread Merge commit 'cd7170d7ee81d1be9e5c93e9e372e2b58fe5d959' into gingerbread-plus-aosp * commit 'cd7170d7ee81d1be9e5c93e9e372e2b58fe5d959': Support Additional CTS Host Jars