tree 7e716d533165439fcbd4bc109b361d17c273fc4f
parent a562241deee19bc9c8626906cbbbdac6a5443e59
parent af944a69fe3335953423c7d6cff68d4dce54ea1e
author Nicolas Geoffray <ngeoffray@google.com> 1488372070 +0000
committer android-build-merger <android-build-merger@google.com> 1488372070 +0000

Merge "Add a -testdex variant for ART run-tests." am: 6feb860f98 am: fa0d1f680a
am: af944a69fe

Change-Id: I1ee6b41054c522b8856fb1eb80b49e68b7e82f32