Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 42d91db0aa am: eb419455ef...
authorPyry Haulos <phaulos@google.com>
Thu, 8 Sep 2016 22:09:43 +0000 (22:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 8 Sep 2016 22:09:43 +0000 (22:09 +0000)
am: 09fec6cb5c

Change-Id: I40ed3c7dddd0dbb5994224fb383028954677b481


Trivial merge