diff options
| author | Chris Tate <ctate@android.com> | 2021-04-06 16:49:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-06 16:49:29 +0000 |
| commit | 2bec84a79480f97e8fc6530ca2b66569c5587b93 (patch) | |
| tree | 6304e699b5b03b6185353e62f7c2bb7054275446 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 1735cdeea4e31d3f405e8f6e0f343c7d9a1cd539 (diff) | |
| parent | 6cc887c00de0549c50157fce0510b249f7572840 (diff) | |
[automerger skipped] Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into oc-mr1-dev am: 6cc887c00d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13779450
Change-Id: I9bab541f7c0c87385e1c5adb1a6beb5db4eda535
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions