diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-10 02:15:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-10 02:15:37 +0000 |
| commit | bdbc8801383cb352b16fe3e5d09dd3add1421819 (patch) | |
| tree | 4775e35c120dd484fd127a8baf897bd58e3bc14d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 1486652e15fbf5c26a6f8d3f3c767b612aa30fe8 (diff) | |
| parent | 477dcfec1e14a4b4ad6b44e9da89e9d43b06bafb (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: 477dcfec1e -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: I6963c082400a38ad6d0edba3b8fc66cd8e9aba3f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions