diff options
| author | Chris Tate <ctate@android.com> | 2021-04-27 22:33:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-27 22:33:12 +0000 |
| commit | 3201b6ee341cd9b03ad0f6f309c51b8c43c274b2 (patch) | |
| tree | e1a6ff8180051fe1b15e55e3bd1df0bc7d62e72f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 45c4c9f1ec46a7fa38bf421a32498f1725c95310 (diff) | |
| parent | 0dbc306379ce012757242abb7ed81b7e7777123a (diff) | |
[automerger skipped] Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into qt-dev am: 7b0067c950 am: 05dd5f18e3 -s ours am: 0dbc306379 -s ours
am skip reason: Merged-In I1c2bb78d86f194585d273661cecf3419f51965df with SHA-1 8cb7e0a881 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13728411
Change-Id: I06f7d74e63da08fc07090cd6fb960cc0f1ffb5b2
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions