Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
authorPyry Haulos <phaulos@google.com>
Thu, 22 Sep 2016 20:16:08 +0000 (13:16 -0700)
committerPyry Haulos <phaulos@google.com>
Thu, 22 Sep 2016 20:16:08 +0000 (13:16 -0700)
Change-Id: I9a4ae0c9e469c2cd6b865a67bf659dee0e078c4b


Trivial merge