Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
authorPyry Haulos <phaulos@google.com>
Thu, 8 Sep 2016 20:15:50 +0000 (13:15 -0700)
committerPyry Haulos <phaulos@google.com>
Thu, 8 Sep 2016 20:15:50 +0000 (13:15 -0700)
Change-Id: I093c350e439e256a070c1bd7d199fafdb46bd2d8


Trivial merge