Merge "Merge Vulkan CTS 1.0.2.4 into aosp/master" am: 0f5658c72b am: 0419094593 am...
authorMika Isojarvi <misojarvi@google.com>
Mon, 17 Jul 2017 20:28:16 +0000 (20:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 17 Jul 2017 20:28:16 +0000 (20:28 +0000)
am: da711b4c16

Change-Id: Ic3a5c0cbac5a6bb93659f4bb48a7f34395592cc0


Trivial merge