tree c55bf964e0c819ff0196f56eaf5254dae9efcd7e
parent 21577296ea6689b6642ae3d738602f4c394e1d2f
parent 824fe31298eee379e45538ca5c5d90a7c114bc79
author Shuo Qian <shuoq@google.com> 1497243255 +0000
committer android-build-merger <android-build-merger@google.com> 1497243255 +0000

Merge "Merge "Fix vts tests:" into oc-dev am: 14b34e19d6 am: 01cb1ff6d7  -s ours" into oc-dr1-dev-plus-aosp
am: 824fe31298  -s ours

Change-Id: If2a9f01485c53552008a8e6934433d6ec6f91d93