summaryrefslogtreecommitdiff
path: root/vulkan/libvulkan/api.cpp
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-06-27 03:22:02 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-06-27 03:22:02 +0000
commit48368ac833b940959a4f29cc290cfd01de6b30d6 (patch)
tree99581afe879780e0d796c225ebc97370979b417c /vulkan/libvulkan/api.cpp
parent43e58df8131c638322237bfab62a57b70d3990c5 (diff)
parent0f2bdb6ed3a1beb520971c33801d5ae2c8764513 (diff)
Merge "[automerger skipped] Call Layer::getLayerDebugInfo from the main thread am: 927b3b1208 -s ours am: bf6f3dec9f -s ours am: 1e4cccab8d -s ours am: f4beceb1e8 -s ours am: a97e47b2ef -s ours" into rvc-d1-dev-plus-aosp am: e528e8bbb0 -s ours am: 0f2bdb6ed3 -s ours
am skip reason: Change-Id I04daedcb9a890083cc710bab30b295e14b9872ae with SHA-1 927b3b1208 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/11972490 Change-Id: I6215f46d4aecdafce91ca385874fd3d43c4daa63
Diffstat (limited to 'vulkan/libvulkan/api.cpp')
0 files changed, 0 insertions, 0 deletions