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

Change-Id: If9a83a67de78da539acabba23abe5130f57ed75b


Trivial merge