Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 8bff020a8a am: c047913d3d...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 18:42:12 +0000 (18:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:42:12 +0000 (18:42 +0000)
am: 5ae2308375

Change-Id: I0df96e232eacd5c725eb0ed55acf0af3ff047bb2


Trivial merge