Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 42d91db0aa am: eb419455ef...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 17:53:47 +0000 (17:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 17:53:47 +0000 (17:53 +0000)
am: d5f2bd663c

Change-Id: I4cbb1214c1278e430739b94b62be30323d4aac14


Trivial merge