Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
authorPyry Haulos <phaulos@google.com>
Sat, 12 Nov 2016 02:11:08 +0000 (02:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 12 Nov 2016 02:11:08 +0000 (02:11 +0000)
am: 8bff020a8a

Change-Id: I5ecf9f9265e3527729de2c8f526a46f3c2b73212


Trivial merge