diff options
| author | Julia Reynolds <juliacr@google.com> | 2022-01-21 04:31:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-21 04:31:52 +0000 |
| commit | af390eecf288d72996ebb4c3a0ddad928786a1d9 (patch) | |
| tree | da180bb4f94dc927d192d1f6ea6a7f1cf5e7efa1 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | c6e54cabfc126aa0177c27931c0a41b00b84c052 (diff) | |
| parent | 6dcb9e28beeafcef26966e47e76d83d8efd0f37a (diff) | |
[automerger skipped] Merge "DO NOT MERGE Prevent apps from creating blocked channel groups" into qt-dev am: f1dc5b1ee1 am: 960d42c069 -s ours am: 2675838e1b -s ours am: f4e13e6e6a -s ours am: 6dcb9e28be -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16621952
Change-Id: Ibef974616bc15db926bbe49048e98a37299384a3
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions