tree 42975e7b319c2a9d445f78920dbc86fa4e735340
parent 9cd59849fd4aea42962913eb77a0e37029d2f1c9
parent 09690448041330d36e7bcbb24ffda0275fb35929
author Matías Hernández <matiashe@google.com> 1729182411 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1729182411 +0000

[automerger skipped] Merge "Fix allowlist token issues" into sc-v2-dev am: 34984a2eaa -s ours am: f9b6db53d3 -s ours am: 76570b43e1 -s ours am: 8226b0294a -s ours am: 6f53ee55ec -s ours am: 562b22915c -s ours am: 0969044804 -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: If61bb723b86056cdd94bff2596787462a6081951
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>