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

Change-Id: I9f9dc0b846300251f91415f6f36cc94d76860e8b


Trivial merge