tree b6069b8066b4709413fdca3dbf94fc487a5dd29d
parent 2732048e77e08a962f5ebec76fc371aea70826db
parent 650927c7340abcbef36dec656b7447fbe1894ec2
author Chiachang Wang <chiachangwang@google.com> 1620900453 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1620900453 +0000

Merge "Add test for ConnectivityManager.setGlobalProxy()" am: 78c1663ba3 am: 650927c734

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1688272

Change-Id: I669ec8fe9be1b0f319df22e39a008dc298dfe66e