tree 3d29c405dae28794be1eac039aaad6311b759524
parent f6f53164602d6bb6da7adaa901722efd808ac714
parent 832e7bd89a825e3c4b0788c6c1e9debc0657c9aa
author Zhuoyao Zhang <zhuoyao@google.com> 1487013471 +0000
committer android-build-merger <android-build-merger@google.com> 1487013471 +0000

Merge "Update vts files on aosp." am: 248e3932fe am: 848e5db57f
am: 832e7bd89a

Change-Id: If86e71c6f1d99c3a4cd37adf320c2598621c30e9