diff options
author | Chris Tate <ctate@android.com> | 2021-04-06 16:54:35 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-06 16:54:35 +0000 |
commit | 9cd02f1d7f691462f7f69beb09544a3e6986e9d6 (patch) | |
tree | 9dae7cc54e5f8e429ca01be227f1f711137ec4af /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 76a15c06f458819be66a1b8b7f463f18c4d8dd5b (diff) | |
parent | 2bec84a79480f97e8fc6530ca2b66569c5587b93 (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13779450
Change-Id: I46867095ccca009f3dc99da1fdb50f74f7d3b7da
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions