diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-10 01:43:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-10 01:43:19 +0000 |
| commit | ace84bf09fd6fc16c36ae1c6374ac4a8ccc5c1cb (patch) | |
| tree | cbe0f9e4bba4f90901f8135948ffc00213987e5f /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 34dc3a66376fe04f803343b6bb1ae71922489960 (diff) | |
| parent | 107c868f109199f005a7984d43aa1df0cf72debe (diff) | |
[automerger skipped] Merge "[CS] Add an option to block sensitive network specifier" into pi-dev am: 9c70259e2b -s ours am: 634c26d63f -s ours am: fe846d3095 -s ours am: 107c868f10 -s ours
am skip reason: Change-Id If08d312ff814bdde1147518f923199e6349503d5 with SHA-1 836ad571eb is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12321778
Change-Id: Ie0d62c79853bc017102ad95acc1a5190182a92c7
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions