Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: dd932ed858
authorPyry Haulos <phaulos@google.com>
Fri, 6 Jan 2017 22:38:23 +0000 (22:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 6 Jan 2017 22:38:23 +0000 (22:38 +0000)
am: a0b7513d8a

Change-Id: I1b89580c4e8be4993d5d32624d510517689006e2


Trivial merge