tree 4bf8f1d8e606f4cda03c9919708527e1ff940bf8
parent 3aae4079560f5ac989799f6aa52fe35423fba904
parent 3860d416cb2d32b1b667768929ced32ae2da2c04
author Shuo Qian <shuoq@google.com> 1500595589 +0000
committer android-build-merger <android-build-merger@google.com> 1500595589 +0000

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

Change-Id: I69a60ce5efd0bfa59e8d9bad1a7de6c1bcee23c9