tree 9e4dbad1f2562b24c69283b5cafa0030c1551bd4
parent c36d38fb55d0b9dfc39f2ad0cdbcf4b509a23686
parent 14b34e19d6b57a9b54f6e7098abbd503944dd71a
author Shuo Qian <shuoq@google.com> 1497242909 +0000
committer android-build-merger <android-build-merger@google.com> 1497242909 +0000

Merge "Fix vts tests:" into oc-dev
am: 14b34e19d6

Change-Id: Ib2f1a77ece04254a73cdd69c9a46206593c5d4a9