Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
authorPyry Haulos <phaulos@google.com>
Tue, 24 Jan 2017 17:07:51 +0000 (09:07 -0800)
committerPyry Haulos <phaulos@google.com>
Tue, 24 Jan 2017 17:07:51 +0000 (09:07 -0800)
Change-Id: Ifee45dee9fe57a8386c468dfedfb822c329f2504

1  2 
Android.mk
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp

diff --cc Android.mk
Simple merge