diff options
| author | Daniel Bright <dbright@google.com> | 2021-02-26 15:55:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-26 15:55:19 +0000 |
| commit | 3f7e01f490eb4f2dbe090396b99a02dfc056aa25 (patch) | |
| tree | d110b7ee9e8ed2a201e059f55c1243b6b021ddc2 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 40321b70da1395a15247fbaadf2f279b15b8a29b (diff) | |
| parent | 1d191d325154b47841d50a600b94258b2e05774a (diff) | |
Merge "Revert "Add CAPABILITY_ALLOWED_NETWORK_TYPES_USED"" am: 3e21e0ab47 am: 1b9199883c am: 1d191d3251
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1606541
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic42abca83a96074efcc9fc9df14c7780a71b446b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions