tree 27252476c96ba8373b06bb46eb318cdbf89f47ff
parent ad41d1fc11f100ea036cadeb17ed27bf0f5a03d8
parent 06e105727ba12472231171c4a32ca1a48fa8bcf9
author Igor Murashkin <iam@google.com> 1462222297 +0000
committer android-build-merger <android-build-merger@google.com> 1462222297 +0000

Merge "old-cts: Add support for testng runners and libcoreoj tests" am: 665502b333
am: 06e105727b

* commit '06e105727ba12472231171c4a32ca1a48fa8bcf9':
  old-cts: Add support for testng runners and libcoreoj tests

Change-Id: Icb0bd633efc1323c59a1c9a12a34880cfdb5abf7