commit | d13e2ecc4e4d644aba482ff7dce6f02147bdc1da | [log] [tgz] |
---|---|---|
author | Vishnu Nair <vishnun@google.com> | Mon Feb 07 23:56:20 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Feb 07 23:56:20 2022 +0000 |
tree | 35c509c31ef9bd61cf3aab6eab9653d5a324c508 | |
parent | 5703342e03124522bbc4b35c7abf772f27741a8b [diff] | |
parent | 0750ba8c651cdd83c3993987349940c2b8d4159b [diff] |
[automerger skipped] Merge changes from topic "toast-security-fix-sc-dev" into sc-dev am: 799f0a7f66 am: 0750ba8c65 -s ours am skip reason: Merged-In I316b76b685ca5030fd8aa91283555efcce4d6994 with SHA-1 3b8aa02ba5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16740079 Change-Id: Ia0a382540eaf9332b6ed12dee8fb5bd6414cc6ec