commit | 8ac4b8105eb73eec5983f6ee7b4d1445fa568b3b | [log] [tgz] |
---|---|---|
author | Chia-chi Yeh <chiachi@android.com> | Mon May 31 12:34:24 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 31 12:34:24 2021 +0000 |
tree | 418ef44eed775ad5e37c95f44dfbd02be9776782 | |
parent | 9aa2940476d239de53c9135336c23655c80ed597 [diff] | |
parent | 19d17dde294b846dc771254cd8a86b3b200711d3 [diff] |
Merge "VPN: temporarily disable the default proxy when VPN is active." am: ec49c91929 am: 19d17dde29 Original change: undetermined Change-Id: I02f436ee93438712ac2ff9a5f8fcfbb228703af3