Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
authorPyry Haulos <phaulos@google.com>
Fri, 14 Oct 2016 23:00:28 +0000 (23:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 14 Oct 2016 23:00:28 +0000 (23:00 +0000)
am: 5f69b27051

Change-Id: Ic9ac375163fd1de9a1a1a7e7549894a4faa200a2


Trivial merge