projects
/
platform
/
upstream
/
VK-GL-CTS.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
113a395
853e372
)
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 984f29db76 am: 26c200ccb2
author
Pyry Haulos
<phaulos@google.com>
Wed, 12 Oct 2016 17:05:45 +0000
(17:05 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 12 Oct 2016 17:05:45 +0000
(17:05 +0000)
am:
853e372b40
Change-Id: Id469d7386ef33b8f2f81deb7ec8c08b45bcd4a11
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