Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
authorPyry Haulos <phaulos@google.com>
Fri, 18 Nov 2016 18:40:54 +0000 (10:40 -0800)
committerPyry Haulos <phaulos@google.com>
Fri, 18 Nov 2016 18:40:54 +0000 (10:40 -0800)
Change-Id: I656d82525b18e936b6c4a78dd73cbb9ef65a06a4


Trivial merge