diff options
| author | 2023-12-11 23:01:29 +0000 | |
|---|---|---|
| committer | 2023-12-11 23:01:29 +0000 | |
| commit | 16c3b8ba2a83150a9ed0551aa9588977446c2fc1 (patch) | |
| tree | 898bd9cab409a2d10672c410be1725b1651ad0d5 /vulkan/libvulkan/api.cpp | |
| parent | 9a08f662d679ec3912ec3e5acf0befb93b6e2f43 (diff) | |
| parent | 3c53e66239d8278ddf37409858b2e5dd3fb5144a (diff) | |
[automerger skipped] Merge "Merge Android 14 QPR1" into main am: f6a0133bbf -s ours am: 157ef5fdf0 -s ours am: 3c53e66239 -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: I243695745bb99a6a69523a7c47046667f6a68de0
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