Merge upstream vulkan-cts-1.0-dev into AOSP master am: 20a7a532b4 am: 79572f8a12...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 17:24:20 +0000 (17:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 17:24:20 +0000 (17:24 +0000)
am: d2c54444de

Change-Id: Ic16bb2c002c4730b018157eb26ac3ba4cb5f779c


Trivial merge