tree f34acd59e686b577a60f604549df8d362029de21
parent fdfa2d00d9205e51949402fe5e93c5f54b7432a8
parent 376274c2775957667f31821f68d5826b9e48a190
author Chalard Jean <jchalard@google.com> 1617691815 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1617691815 +0000

Merge "Cleanup setGlobalProxy" am: 376274c277

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

Change-Id: I0052f30d52f00f40b933eb1573b1a0de37e9cba2