diff options
| author | Daniel Bright <dbright@google.com> | 2021-02-26 04:17:06 +0000 |
|---|---|---|
| committer | Daniel Bright <dbright@google.com> | 2021-02-26 17:50:28 +0000 |
| commit | 25c1b9b8488035459b79444287f3239509499d65 (patch) | |
| tree | 0ef178ff29876932fab55015a10fd91908f56141 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 7a17ad8ccb4c59748ffaf26736e1286c6f16dc17 (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
Bug: 181335996
Change-Id: Ib29e39622ec998bc911cdd5ec220692c7b6f5ea0
(cherry picked from commit b50587319e23e76032d496526825b55aad30a35c)
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions