Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
authorPyry Haulos <phaulos@google.com>
Fri, 11 Nov 2016 16:43:37 +0000 (08:43 -0800)
committerPyry Haulos <phaulos@google.com>
Fri, 11 Nov 2016 16:43:37 +0000 (08:43 -0800)
Change-Id: I1bf942ca0cb3f4b92c522d60aed6b49a78ec1354


Trivial merge