diff options
| author | 2023-12-11 22:06:15 +0000 | |
|---|---|---|
| committer | 2023-12-11 22:06:15 +0000 | |
| commit | 3c53e66239d8278ddf37409858b2e5dd3fb5144a (patch) | |
| tree | 637af0e9c751d76917b4f36adc08cb58d3f7503b /vulkan/libvulkan/api.cpp | |
| parent | aa9ada5892d2eda310192e577c95d06968648eab (diff) | |
| parent | 157ef5fdf0338211427760ed627b0bc3fb43671d (diff) | |
[automerger skipped] Merge "Merge Android 14 QPR1" into main am: f6a0133bbf -s ours am: 157ef5fdf0 -s ours
am skip reason: Merged-In Ia4da4896800883bda713052a8d084324bbaa6395 with SHA-1 e9fcd8b838 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2865155
Change-Id: I01163aa2fc7862a363a36bc8570350a6e91254a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'vulkan/libvulkan/api.cpp')
0 files changed, 0 insertions, 0 deletions