Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
authorPyry Haulos <phaulos@google.com>
Tue, 27 Sep 2016 18:37:22 +0000 (11:37 -0700)
committerPyry Haulos <phaulos@google.com>
Tue, 27 Sep 2016 18:37:22 +0000 (11:37 -0700)
Change-Id: Ic57898b48c27812332fd03f000f80af9555a878f


Trivial merge