tree 1f0c9bbace733ea086de2241d44e5d45c2b33306
parent 71d233730c6c7b007241d1b5dcfe6d7c0f7d7278
parent 78c1663ba30ffa928b02863272560c722367d055
author Chiachang Wang <chiachangwang@google.com> 1620899069 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1620899069 +0000

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

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

Change-Id: Iaf40a7004a6305ad86b985695bfe4a9ee9038c96