Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
authorPyry Haulos <phaulos@google.com>
Thu, 29 Sep 2016 21:13:52 +0000 (14:13 -0700)
committerPyry Haulos <phaulos@google.com>
Thu, 29 Sep 2016 21:13:52 +0000 (14:13 -0700)
Change-Id: I0a9fb821325ade846a4fd77e6bc54ed315892f42


Trivial merge