OSDN Git Service

Merge "Fix vts tests:" into oc-dev am: dda2e8cdc2 am: c1feed1128
authorShuo Qian <shuoq@google.com>
Fri, 9 Jun 2017 02:17:38 +0000 (02:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Jun 2017 02:17:38 +0000 (02:17 +0000)
am: aef955721f

Change-Id: I538172421bc58510b301367bf788f4e541e192f8


Trivial merge