tree 27bbc22a588ff927aebaafda553bd719061eb3ba
parent 15f2bcf5c5207dffe9cfccf153cdff85afce8447
parent 2baece252fc77206c0f894ea3ca060166292ca7e
author Nicolas Geoffray <ngeoffray@google.com> 1488372075 +0000
committer android-build-merger <android-build-merger@google.com> 1488372075 +0000

Merge "Add a -testdex variant for ART run-tests." am: 5edf30c23d am: 832e01a099
am: 2baece252f

Change-Id: I4e8dd05272e1bcef6032c89f022856ad70ed36e9