Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 1a6d3c9ee7
authorPyry Haulos <phaulos@google.com>
Thu, 15 Sep 2016 23:35:35 +0000 (23:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 15 Sep 2016 23:35:35 +0000 (23:35 +0000)
am: 1d692218d3

Change-Id: I925131a5eac48ef205f80695d6a6261b7fde1ac4


Trivial merge