tree 6168ee84cc09db4376870f2539e38408586d61f1
parent 99f75a1a9e3647cb3c5f0485483dd008b3fc0060
parent 47497a05363e884156b87275135c7ab72a069509
author Zhuoyao Zhang <zhuoyao@google.com> 1487013664 +0000
committer android-build-merger <android-build-merger@google.com> 1487013664 +0000

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

Change-Id: I2a66a8ef82ce6d93ad8ab274832dd3fdb15a0f95