tree c6c3563958c7b61e7735ddc1438c8bcc14f9e7e7
parent 0c9660f6cd31e66db7e99f865864ea7e6590ced3
parent ee5a9dacd0d733a92826f1b7481f958836c90da5
author Chalard Jean <jchalard@google.com> 1617694244 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1617694244 +0000

Merge "Cleanup setGlobalProxy" am: d14c0bcc22 am: ee5a9dacd0

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

Change-Id: I0a8d51af2280d47f3924f66d56e529f57057b3bb