Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 2f2ce0f048 am: ea762c3174...
authorPyry Haulos <phaulos@google.com>
Thu, 29 Sep 2016 23:23:15 +0000 (23:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 29 Sep 2016 23:23:15 +0000 (23:23 +0000)
commit12568ee7fd9ca2a45668e21a8760c3fb7ece1e6c
tree75c2b8f3644d08fea2498cab76f74ce0f1559881
parentc27db44702c945eaf8d93fbc4282a77781139ce1
parent7de6e0f3dd9a9b61fa30246c230a128195684ae8
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 2f2ce0f048 am: ea762c3174 am: 54fec9051e
am: 7de6e0f3dd

Change-Id: I68170be42e32cb4cd0debe62ccfef3df4fb52744
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp