diff options
| author | Chris Tate <ctate@android.com> | 2021-04-27 23:32:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-27 23:32:54 +0000 |
| commit | 4dbd550f235584898871bc3a61d37d2814a66c64 (patch) | |
| tree | c9dbc9790b6043141d6e5426005e571265e45f27 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 748e7dec5b4217d6e988555dc2cefc2d8140cc39 (diff) | |
| parent | f5e46bc7ae62043b5de7ca4f26991476a0e5bcc9 (diff) | |
[automerger skipped] Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into pi-dev am: 1735cdeea4 -s ours am: 76a15c06f4 -s ours am: e0a844da8b -s ours am: eff05e86d3 -s ours am: 79ba5701cd -s ours am: f5e46bc7ae -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13743878
Change-Id: I456528593b489811482201bc848cdbddf1bdb3a5
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions