diff options
| author | Chris Tate <ctate@android.com> | 2021-04-27 21:23:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-27 21:23:19 +0000 |
| commit | e0a844da8b0ad2b9ad6a72ae3cc2b0b6543cfc90 (patch) | |
| tree | e0d668f97104052d2e232af4ec2de5c20b9bae0c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 05dd5f18e39e2b34eb8a2901b56b54d4e1d54446 (diff) | |
| parent | 76a15c06f458819be66a1b8b7f463f18c4d8dd5b (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 skip reason: Merged-In I1c2bb78d86f194585d273661cecf3419f51965df with SHA-1 88380a00d5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13743878
Change-Id: I89e87fd4fd57222a3d4095944791cae8082bfc81
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions