Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 5f69b27051
authorPyry Haulos <phaulos@google.com>
Fri, 14 Oct 2016 23:03:54 +0000 (23:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 14 Oct 2016 23:03:54 +0000 (23:03 +0000)
am: 399f8849cf

Change-Id: I517a14ca20363ce814d9608b61adcaa6a953f531


Trivial merge