Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 43e50db72d
authorPyry Haulos <phaulos@google.com>
Fri, 11 Nov 2016 18:27:13 +0000 (18:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 11 Nov 2016 18:27:13 +0000 (18:27 +0000)
am: ae92b0c427

Change-Id: I32eaaba374c77bb60c2aa7138dc6a46a3d3f8782


Trivial merge