Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
authorPyry Haulos <phaulos@google.com>
Fri, 14 Oct 2016 20:48:05 +0000 (13:48 -0700)
committerPyry Haulos <phaulos@google.com>
Fri, 14 Oct 2016 20:48:05 +0000 (13:48 -0700)
Change-Id: I782798e35e4537d7cc0dbbc7a2f46f6adebc682d


Trivial merge