Merge upstream-vulkan-cts-1.0-dev into master am: fb20fc5f5d am: c0d5f3c3bd am: 93a21...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 17:36:19 +0000 (17:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 17:36:19 +0000 (17:36 +0000)
am: f9135a42f1

Change-Id: Ia18a0bac3ccb8d058728eb3d415de5e230b0cc54


Trivial merge