OSDN Git Service

am 99185c2a: am cd7170d7: resolved conflicts for merge of 0f8fcbe2 to gingerbread
authorBrian Muramatsu <btmura@google.com>
Sun, 10 Oct 2010 19:51:28 +0000 (12:51 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 10 Oct 2010 19:51:28 +0000 (12:51 -0700)
commit0dd458e65ab537a7a961e54257dcb77628ec3789
treea03292d524eaffce6cddcc9a9282c3a0e3c38f72
parenteef1d7d422ac85a8b4de9a9ef1415c8537f33406
parent99185c2a462d563855e4bc0c1e5649a21b2e186b
am 99185c2a: am cd7170d7: resolved conflicts for merge of 0f8fcbe2 to gingerbread

Merge commit '99185c2a462d563855e4bc0c1e5649a21b2e186b'

* commit '99185c2a462d563855e4bc0c1e5649a21b2e186b':
  Support Additional CTS Host Jars
core/tasks/cts.mk