tree 37bea83fa9b8b49121ea6db307a565743ce0d394
parent 38ca72088146ebd8b78cc705f409428136c1a136
parent 62b1d6d05af68504602f74a87ff956a1d2348f45
author Matías Hernández <matiashe@google.com> 1729179191 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1729179191 +0000

[automerger skipped] Fix allowlist token issues am: 5d107bcde7 -s ours am: f0157c59b5 -s ours am: 7c883f24a3 -s ours am: 62b1d6d05a -s ours

am skip reason: Merged-In I232e9b74eece745560ed2e762071b48984b3f176 with SHA-1 61274fc61f is already in history

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

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