tree f34acd59e686b577a60f604549df8d362029de21
parent a278abb926b6c663f2e03d3e13a009b3c0d45251
parent 676eccd672124eb25ef5993370195b7cd69e00af
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: 376274c277 am: 676eccd672

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

Change-Id: I0a8d51af2280d47f3924f66d56e529f57057b3bb