Merge upstream-vulkan-cts-1.0-dev into master am: c641c2e631 am: ff17828d24 am: cac26...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 17:41:41 +0000 (17:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 17:41:41 +0000 (17:41 +0000)
am: d80cc10978

Change-Id: I4b5e6ce6a693153c5973fd9498edd67bb78a0d47


Trivial merge