Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
authorPyry Haulos <phaulos@google.com>
Fri, 11 Nov 2016 22:53:54 +0000 (14:53 -0800)
committerPyry Haulos <phaulos@google.com>
Fri, 11 Nov 2016 22:53:54 +0000 (14:53 -0800)
Change-Id: I68f026a0c2f69918f03b14e479ad5473db08a7a0


Trivial merge