projects
/
platform
/
upstream
/
VK-GL-CTS.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2287e5f
76d1c8c
)
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 47d74e847e am: c7c28e6fa6...
author
Pyry Haulos
<phaulos@google.com>
Tue, 10 Jan 2017 22:28:08 +0000
(22:28 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 10 Jan 2017 22:28:08 +0000
(22:28 +0000)
am:
76d1c8c075
Change-Id: Id6b7c7cadc41dc7b3537e60fbf0029066975bac1
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