Merge "Merge Vulkan CTS 1.0.2.5 into goog/oc-mr1-dev" into oc-mr1-dev
authorMika Isojarvi <misojarvi@google.com>
Mon, 28 Aug 2017 21:35:22 +0000 (21:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 28 Aug 2017 21:35:22 +0000 (21:35 +0000)
am: 758c7ce466

Change-Id: I30cdabd60ac0370193b932b7492dd92ac52e282e


Trivial merge