diff options
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-10 02:15:24 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-10 02:15:24 +0000 |
commit | 1486652e15fbf5c26a6f8d3f3c767b612aa30fe8 (patch) | |
tree | 4775e35c120dd484fd127a8baf897bd58e3bc14d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 7af86edd3c330f9314a5c57d350e6cf8a1d1cf44 (diff) | |
parent | 1a4fed1ace6b10e02c06182a9a42533ffe07be8d (diff) |
Merge "[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" into rvc-d1-dev-plus-aosp am: 1a4fed1ace -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: Iad1bd8cd64ea6b3385f8bc09815d48ad45f9b0b6
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions