tree f8aae0dd4c4292857b04a643c154107f5c16513a
parent 2320733615c8c8aab61078f6b8362381bda664d4
parent 8cce6d3336b82290a9e59c18b9460f39c96983f8
author Chalard Jean <jchalard@google.com> 1617695754 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1617695754 +0000

Merge "Cleanup setGlobalProxy" am: 376274c277 am: 676eccd672 am: 8cce6d3336

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640148

Change-Id: Ic9757060f398aaf871141dc5199bf49988637937