tree bde843c0ea065c69948fe544ae8fd99c1154bdd5
parent f9b6db53d362953800a49a5106846e11df1caf43
parent b4a1eaab44ed62ec7ca3fe6ffbcce4c0bdabe900
author Matías Hernández <matiashe@google.com> 1729182275 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1729182275 +0000

[automerger skipped] Merge "Fix allowlist token issues" into sc-dev am: ce91b479d7 am: 483996545f -s ours am: b4a1eaab44 -s ours

am skip reason: Merged-In I232e9b74eece745560ed2e762071b48984b3f176 with SHA-1 5d107bcde7 is already in history

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

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