OSDN Git Service

Merge "Fix --jvm on run-tests 960 and 961" am: aac223f83b
authorAlex Light <allight@google.com>
Fri, 20 Nov 2015 19:07:09 +0000 (19:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Nov 2015 19:07:09 +0000 (19:07 +0000)
commit174cd78000d4a54926367ac94a014e8172f65414
treecf49e7cf4b9a1dad07409fe2b23c51e10aa78f23
parent23fe448699796c32fed8f7cef8919e06d0bcaeed
parent5fba52d09afca426be0e275cd34f1e68bc0f1fa1
Merge "Fix --jvm on run-tests 960 and 961" am: aac223f83b
am: 5fba52d09a

* commit '5fba52d09afca426be0e275cd34f1e68bc0f1fa1':
  Fix --jvm on run-tests 960 and 961