Merge "Merge upstream-vulkan-cts-1.0-dev into master" am: 553f24edf2 am: ecfd015f05...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 17:36:37 +0000 (17:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 17:36:37 +0000 (17:36 +0000)
am: 698d9be9c4

Change-Id: I7e6df1b840110c5e7f6d114c0ad836f208615ac4


Trivial merge