diff options
author | Chris Tate <ctate@android.com> | 2021-04-27 22:34:30 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-27 22:34:30 +0000 |
commit | 18252b299b247334a3f1394f494b0cc97c1f6e89 (patch) | |
tree | e1a6ff8180051fe1b15e55e3bd1df0bc7d62e72f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 79ba5701cdc6505adc1494c208ff2649000311f4 (diff) | |
parent | 91fbccc817592baa522f5df3c3400108b056bb2c (diff) |
[automerger skipped] Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into oc-mr1-dev am: 6cc887c00d -s ours am: 2bec84a794 -s ours am: 9cd02f1d7f am: 22feb668e8 -s ours am: 91fbccc817
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13779450
Change-Id: I235d145a0f586bef8436d492a7e8a7fdddabec43
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions