diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-10 01:59:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-10 01:59:15 +0000 |
| commit | 31b35432526759c55d916569dabe491bbbc3114b (patch) | |
| tree | fba70df36937043bc8a63aebbf5167ae503ec135 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 33b7db96e276af5d8454934425cd47eb362fb4c2 (diff) | |
| parent | ace84bf09fd6fc16c36ae1c6374ac4a8ccc5c1cb (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: ace84bf09f -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: Ice0925112fbe3503ca968dd0ae397a89f8c520f9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions