tree d8e1b26d2a9fcecc6e3fd8aad218a3db7ebd1143
parent 88cfac9540bd8af01c387d5e40aefde4e9638b63
parent 649a2c13d7ef31a839e7d228541c83395e7476b2
author Yuexi Ma <yuexima@google.com> 1489180283 +0000
committer android-build-merger <android-build-merger@google.com> 1489180283 +0000

Merge "Change vts target base test class name" am: 4f4fdaf664 am: a8239094f4
am: 649a2c13d7

Change-Id: I376e83c09515ba50a7e033e3cb75e0c5f8a24ccf