diff options
author | Chris Tate <ctate@android.com> | 2021-04-27 23:14:21 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-27 23:14:21 +0000 |
commit | e5f2ad12032cf86ac28e6ddb89df587cbf587884 (patch) | |
tree | 70707c563daa0d352f1d94987f75d9d11b853ca6 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | f5e46bc7ae62043b5de7ca4f26991476a0e5bcc9 (diff) | |
parent | 18252b299b247334a3f1394f494b0cc97c1f6e89 (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
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13779450
Change-Id: I496b07ce65577bd215b37e5ecd07663f1ff75e26
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions