OSDN Git Service

(root) / android-x86 / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eef1d7d 99185c2)
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)
Merge commit '99185c2a462d563855e4bc0c1e5649a21b2e186b'

* commit '99185c2a462d563855e4bc0c1e5649a21b2e186b':
  Support Additional CTS Host Jars

1  2 
core/tasks/cts.mk patch | diff1 | diff2 | blob | history

diff --cc core/tasks/cts.mk
Simple merge
build
About OSDN
Find Software
Develop Software
Help