projects
/
platform
/
upstream
/
VK-GL-CTS.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8e32ffd
43e50db
)
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
author
Pyry Haulos
<phaulos@google.com>
Fri, 11 Nov 2016 18:20:18 +0000
(18:20 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 11 Nov 2016 18:20:18 +0000
(18:20 +0000)
am:
43e50db72d
Change-Id: I33d13e009d97558145ba7d8908a8117fcfe3b377
1
2
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
Simple merge