diff options
author | Chris Tate <ctate@android.com> | 2021-04-06 18:24:27 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-06 18:24:27 +0000 |
commit | 0908b0d8d34f911086b29e94402d670bcb42b6f4 (patch) | |
tree | 9be02957dc2942b6babc5506d20ce5f327040e5a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | b27dfc8b28af60bea731376d07fdf562b5d15632 (diff) | |
parent | ac47f8e9ec1082779e20ec89c1a62172f8cb35de (diff) |
[automerger skipped] Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into rvc-dev am: 68a604b920 am: 1de72903d4 am: ac47f8e9ec -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13533155
Change-Id: Iaf95015ea4dbd9435641419a85d217778c69bfea
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions