tree fac68bb981b5dbb612d3e09ffa0f1247a8b76a54
parent 7b58ba4813170d29357fb95321cd442d2f3fe3e1
parent 075cede6fd193d4ebca656e9cb01309cf11009cc
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583501102 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583501102 +0000

Merge "vpn: Fix NPE in VpnConfig#toString when no ProxyInfo is set" into rvc-dev am: 4cf6815168 am: da7b5b0b09 am: 075cede6fd

Change-Id: I29770d5b1b2b7510dca5c4b5b9e52faa626c3a8a