Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: dd398940da am: 9662ce0ae6...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 19:16:05 +0000 (19:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 19:16:05 +0000 (19:16 +0000)
am: e090bf72d4

Change-Id: Iab77399e3768478d5af4a63175a11ec62cbb42b9


Trivial merge