OSDN Git Service

Merge "Merge "Fix vts tests:" into oc-dev am: 14b34e19d6 am: 01cb1ff6d7 -s ours...
authorShuo Qian <shuoq@google.com>
Mon, 12 Jun 2017 04:54:15 +0000 (04:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 12 Jun 2017 04:54:15 +0000 (04:54 +0000)
am: 824fe31298  -s ours

Change-Id: If2a9f01485c53552008a8e6934433d6ec6f91d93


Trivial merge