Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
authorPyry Haulos <phaulos@google.com>
Fri, 18 Nov 2016 20:46:16 +0000 (20:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 18 Nov 2016 20:46:16 +0000 (20:46 +0000)
am: c9061d1b52

Change-Id: I24f864e246bd5d5ab5677cb0f5edeff67b9ad547


Trivial merge