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:21:05 +0000 (21:21 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 28 Aug 2017 21:21:05 +0000 (21:21 +0000)

Trivial merge