| commit | b60df225a452319af79904690d3d75504f16d92c | [log] [tgz] |
|---|---|---|
| author | Matías Hernández <matiashe@google.com> | Thu Oct 17 18:09:22 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 17 18:09:22 2024 +0000 |
| tree | f7d5024b5dace93c7cc03c7680422141fe6858d5 | |
| parent | 7646f432a92c8eac9a4349ed57744c30e61a1129 [diff] | |
| parent | c4783f6702c4bfa2d2031078de81408bc7bfb9af [diff] |
[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 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: Idd45fba6cafa3dcad3b4d895a89f98472a52a680 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>