commit | 45c4c9f1ec46a7fa38bf421a32498f1725c95310 | [log] [tgz] |
---|---|---|
author | Christopher Tate <ctate@google.com> | Tue Apr 27 22:33:04 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 27 22:33:04 2021 +0000 |
tree | e1a6ff8180051fe1b15e55e3bd1df0bc7d62e72f | |
parent | 3fe3d51c139c83d001d3a1ef67436c50de396bcd [diff] | |
parent | 11f4032b5ed58ac6309dec64694ad1ddad019f27 [diff] |
[automerger skipped] DO NOT MERGE - Disallow deletion of channels with FGS notifications am: 88380a00d5 am: 3c507386ca -s ours am: 11f4032b5e -s ours am skip reason: Merged-In I1c2bb78d86f194585d273661cecf3419f51965df with SHA-1 8cb7e0a881 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13728411 Change-Id: Ied527f94280f1eea4893d993a1120ea1a554abbf