diff options
| author | Daniel Bright <dbright@google.com> | 2021-02-26 13:08:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-26 13:08:06 +0000 |
| commit | 089fd9787ed7816988bb354ffc159c919f61e5ab (patch) | |
| tree | f2cadc536fb08b4dc3379372dd67fc0676913b89 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | c8609a5a6c768efc90dceb8b5f1e9f7518f2c852 (diff) | |
| parent | 604c3e286368e526c6fbddf746a7c5e9ce54f2d9 (diff) | |
[automerger skipped] Merge "Add CAPABILITY_ALLOWED_NETWORK_TYPES_USED" am: 9816c0ce86 am: 248a62077a am: 604c3e2863 -s ours
am skip reason: Change-Id Ie31d32a08b10b8c125f27832e81a3e65b6d8767a with SHA-1 e177c09787 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1598498
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id7c8732e7e1e6c504f0ffd2dc17053adc0030fab
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions