summaryrefslogtreecommitdiff
path: root/vulkan/libvulkan/api.cpp
diff options
context:
space:
mode:
author Xin Li <delphij@google.com> 2021-10-08 01:39:20 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-10-08 01:39:20 +0000
commit7982b965d00991f42548cafcda28b71ab6e89753 (patch)
treee08d18bbb8af1872427336a7cdf7b432f3fd98ae /vulkan/libvulkan/api.cpp
parentc9d149309d26a52799b97a501e6724fd12c4ecbd (diff)
parentf53205299372ad70b567cbd61b7e87653e7ccc05 (diff)
[automerger skipped] Merge "Merge Android 12" am: 9243f909f6 -s ours am: f532052993 -s ours
am skip reason: Merged-In Ifb27b3eb12454fa96f07e6797745c697b4f831c4 with SHA-1 adcb6a2733 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1847658 Change-Id: If958fc41d65843a914ae28a596efc4738da58269
Diffstat (limited to 'vulkan/libvulkan/api.cpp')
0 files changed, 0 insertions, 0 deletions