diff options
| author | Julia Reynolds <juliacr@google.com> | 2022-01-21 04:49:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-21 04:49:36 +0000 |
| commit | f450642f4f8cad7dfeac4ce57a4bbc6743796ada (patch) | |
| tree | ac29469327c8faef10b336abd8473d7bdd482a42 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 955992b81352424cd2cec80306cbf6106faf4484 (diff) | |
| parent | af390eecf288d72996ebb4c3a0ddad928786a1d9 (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: af390eecf2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16621952
Change-Id: I9785ea0d9048095a738209427e49d97954cb8adf
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions