Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
authorPyry Haulos <phaulos@google.com>
Thu, 19 Jan 2017 03:10:08 +0000 (03:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 19 Jan 2017 03:10:08 +0000 (03:10 +0000)
am: dd398940da

Change-Id: I68d6b77062e52e9e8d4cc2b0382906f26cee77a9


Trivial merge