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

Change-Id: I461ee9e7248692cb9b8c64232d8d88542ae4ffa6


Trivial merge