tree 23032a35445854ba537745aa6e9567c72a6af4de
parent a274a279b32b3e0b0d32f30564c3b4a32411620a
parent 7d429f85bfe4b86ed309af3d79a3b61823160b0c
author Zhuoyao Zhang <zhuoyao@google.com> 1496940504 +0000
committer android-build-merger <android-build-merger@google.com> 1496940504 +0000

Merge "Omx vts tests" into oc-dev am: 2e2e255125 am: ca7c33143d
am: 7d429f85bf

Change-Id: I637b54609e6ef86ab98bf0ef5a72552124712e38