diff options
| author | Daniel Bright <dbright@google.com> | 2021-02-26 04:17:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-26 04:17:06 +0000 |
| commit | b50587319e23e76032d496526825b55aad30a35c (patch) | |
| tree | 7c3df1aa01021e61651cf7bae722e41d3a1a890c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | b6f07bbf46de644234409772353f2991f65d1d5b (diff) | |
| parent | 9c4102e2a1bab981a25a4bc1ab31f8b2bcc219b7 (diff) | |
Merge "Revert^2 "Add CAPABILITY_ALLOWED_NETWORK_TYPES_USED"" am: cc318221a5 am: 9c4102e2a1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1606546
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib29e39622ec998bc911cdd5ec220692c7b6f5ea0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions