tree d4d68ef942778a75ea27e469802ed2f638f504ec
parent e5e51f0f1e9ba717ffb6f4caac1105a288952da8
parent 3efced76d580c239b1e93c04496d9bbd820cfdf3
author Xin Li <delphij@google.com> 1716261069 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1716261069 +0000

[automerger skipped] Merge "Merge Android 24Q2 Release (ab/11526283) to aosp-main-future" into aosp-main-future am: 3efced76d5 -s ours

am skip reason: Merged-In I2f7619a401100fa6221aec9da7c2c665013cbb91 with SHA-1 9bc0c25ef0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/rs/+/27273330

Change-Id: I36ca8df57062a62f3cfdf7fd9ea9154fe963cc37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>