commit | 7f5908694006f13e93fd254640b0d9cfc1d44bf2 | [log] [tgz] |
---|---|---|
author | Matías Hernández <matiashe@google.com> | Thu Oct 17 13:45:47 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 17 13:45:47 2024 +0000 |
tree | 37bea83fa9b8b49121ea6db307a565743ce0d394 | |
parent | bf7e23b043cc39bc6172033ddba5b542b60a93ab [diff] | |
parent | 4718b121a44954a6f61e0945cfc17eb2d907ddf3 [diff] |
[automerger skipped] Merge "Fix allowlist token issues" into tm-dev am: e09da15e1e am: c50ae70f90 -s ours am: 4718b121a4 -s ours am skip reason: Merged-In I232e9b74eece745560ed2e762071b48984b3f176 with SHA-1 46aafeb8a6 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/29582686 Change-Id: I01b1ee64407b91da474f1ecbde5d89589289aaa1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>