| commit | 17764cc52ebc55d59200a42107ddf1f0214a5531 | [log] [tgz] |
|---|---|---|
| author | Chris Tate <ctate@android.com> | Tue Apr 27 23:33:13 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 27 23:33:13 2021 +0000 |
| tree | c9dbc9790b6043141d6e5426005e571265e45f27 | |
| parent | 4dbd550f235584898871bc3a61d37d2814a66c64 [diff] | |
| parent | e5f2ad12032cf86ac28e6ddb89df587cbf587884 [diff] |
[automerger skipped] Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into oc-mr1-dev am: 6cc887c00d -s ours am: 2bec84a794 -s ours am: 9cd02f1d7f am: 22feb668e8 -s ours am: 91fbccc817 am: 18252b299b am: e5f2ad1203 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13779450 Change-Id: I1d1a18dfd3e30c420e89f516a1a881a2d89252c5