tree 37bea83fa9b8b49121ea6db307a565743ce0d394
parent 67af561ef63b31f71eedf1a63b908236cb35bb61
parent 7ea99d70f1498f56c9b349294398a333c9446b2e
author Matías Hernández <matiashe@google.com> 1729178174 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1729178174 +0000

[automerger skipped] Merge "Fix allowlist token issues" into sc-v2-dev am: 34984a2eaa -s ours am: f9b6db53d3 -s ours am: 7ea99d70f1 -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: I0e1f95f61eb768244db0efbf3f63a2e4fd437599
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>