Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
authorPyry Haulos <phaulos@google.com>
Tue, 10 Jan 2017 22:13:08 +0000 (22:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 10 Jan 2017 22:13:08 +0000 (22:13 +0000)
am: 47d74e847e

Change-Id: Idc25bc42a5fd9dd34828348b82265d6adf02229b


Trivial merge