tree d4d68ef942778a75ea27e469802ed2f638f504ec
parent a2ea776d10bcff7b5b2cf263bced51b0c30f7a33
parent 1d054f309c73cd6decda708b458a9cff80ab6220
author Xin Li <delphij@google.com> 1716261015 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1716261015 +0000

[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: 1d054f309c -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: Ie5342b6f03e7fab538765bdd51470b4310c8455d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>