OSDN Git Service

Merge "Update VTS tests so that more tests pass for O." into oc-dr1-dev
authorSanket Padawe <sanketpadawe@google.com>
Mon, 24 Jul 2017 23:32:24 +0000 (23:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 24 Jul 2017 23:32:24 +0000 (23:32 +0000)
am: 45a97e51bb  -s ours

Change-Id: I63f66bbc8f2421a3f878795b02c7f8b32d542094


Trivial merge