| commit | 17babeb9f13d2a2f1c97c4b9304bd7213c1f4221 | [log] [tgz] |
|---|---|---|
| author | Chris Tate <ctate@android.com> | Tue Apr 27 23:13:24 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 27 23:13:24 2021 +0000 |
| tree | 70707c563daa0d352f1d94987f75d9d11b853ca6 | |
| parent | f8930138a53464ab31f534d1bb9d70b08b129409 [diff] | |
| parent | 3201b6ee341cd9b03ad0f6f309c51b8c43c274b2 [diff] |
[automerger skipped] Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into qt-dev am: 7b0067c950 am: 05dd5f18e3 -s ours am: 0dbc306379 -s ours am: 3201b6ee34 -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: Idea9fa95098ab38edbe03504464dcbbcb3480d35