tree c5b153920c7958b9a0cebc1d579050902b70913e
parent cc360c3f87580e95afe2a8ac6e0a5c8ddae327b1
parent 41b188be7691c3a2de946b78e0198728eec4e4eb
author Shuo Qian <shuoq@google.com> 1500595437 +0000
committer android-build-merger <android-build-merger@google.com> 1500595437 +0000

Merge "Fix some VTS for 2017 devices" into oc-dev
am: 41b188be76  -s ours

Change-Id: Ic1f9a9b296fdd34837e2927a367b265a82c909a4