tree de2b3905190d0e192906423a291ba044c957c142
parent 92a8c258275ea6bea194b02f7a12b0407b8a8920
parent a04310d7b5d43e4b83c08de855ae588e465445d1
author Xin Li <delphij@google.com> 1706666624 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1706666624 +0000

[automerger skipped] Merge Android 24Q1 Release (ab/11220357) am: a04310d7b5 -s ours

am skip reason: Merged-In Id51dab308ea8b76e335226d555f6b327f6de281e with SHA-1 5329c00299 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/setupcompat/+/25968592

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