tree dbe41f3eb0335093708ca3af35fd9d5fdad21195
parent 6cedad005d37ab23ee0a209ba4b0a6ef42403b43
parent d77a4a5585fefd34c14799e2c0b8a7a876465103
author Pavel Maltsev <pavelm@google.com> 1493062913 +0000
committer android-build-merger <android-build-merger@google.com> 1493062913 +0000

Merge "Fix failing VTS test cases" into oc-dev
am: d77a4a5585

Change-Id: I01f95ca5444957017d0ef47789c8355f98d475b8