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

Change-Id: Id028fbdc5b596d55e044fb80ad34ecc95d0563a4


Trivial merge