Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
authorPyry Haulos <phaulos@google.com>
Thu, 15 Sep 2016 23:31:58 +0000 (23:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 15 Sep 2016 23:31:58 +0000 (23:31 +0000)
am: 1a6d3c9ee7

Change-Id: I632b1f98db42f54c4798f51d77a1e743ca3934c6


Trivial merge