diff options
| author | Chris Tate <ctate@android.com> | 2021-04-27 22:20:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-27 22:20:53 +0000 |
| commit | eff05e86d304c2ea28eded8b435eec128efb73e5 (patch) | |
| tree | d1c055c9a4dc4dd12cb8d50184d89597c3d63368 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 0dbc306379ce012757242abb7ed81b7e7777123a (diff) | |
| parent | e0a844da8b0ad2b9ad6a72ae3cc2b0b6543cfc90 (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13743878
Change-Id: I81ae3d27ab83ef0f8197275b956c7e35de3338d5
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions