diff options
| author | Chris Tate <ctate@android.com> | 2021-04-27 23:32:28 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-27 23:32:28 +0000 |
| commit | 748e7dec5b4217d6e988555dc2cefc2d8140cc39 (patch) | |
| tree | c9dbc9790b6043141d6e5426005e571265e45f27 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 359d27b5fafa0f0c4a582fb2cdd027128b036606 (diff) | |
| parent | 17babeb9f13d2a2f1c97c4b9304bd7213c1f4221 (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: 3201b6ee34 -s ours am: 17babeb9f1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13728411
Change-Id: Ie895afc3a6d22285d84dbf1a55bf5b01b117b48f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions