diff options
| author | Daniel Bright <dbright@google.com> | 2021-03-01 08:03:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-01 08:03:08 +0000 |
| commit | d3cfb31078f84c7140adc8c7fa256c2f054e0782 (patch) | |
| tree | 1eac0249f97eed2817c97840c644f954a2f71162 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 60891de1427662845b32f05ea3f282f3f85f6774 (diff) | |
| parent | b50587319e23e76032d496526825b55aad30a35c (diff) | |
[automerger skipped] Merge "Revert^2 "Add CAPABILITY_ALLOWED_NETWORK_TYPES_USED"" am: cc318221a5 am: 9c4102e2a1 am: b50587319e -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/+/1606546
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id3effe377205a2a1b37eceb2ec978af31d98f23f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions