tree 5c8b787ea01978cb1849efbc2dee18f6d8ddce12
parent 5d3aeef4455c33eded254929fe900cdea4b008dc
parent b60df225a452319af79904690d3d75504f16d92c
author Matías Hernández <matiashe@google.com> 1729189683 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1729189683 +0000

[automerger skipped] Merge "Fix allowlist token issues" into sc-dev am: ce91b479d7 am: 483996545f -s ours am: b4a1eaab44 -s ours am: 02fc106b7d -s ours am: 8fc7c001ef -s ours am: b5471a9cfe -s ours am: 796cd21792 -s ours am: c4783f6702 -s ours am: b60df225a4 -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: I9909b19dcead21fc5a1cedad90f02744803e1586
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>