tree d5d04e24ee9ae71a896257c73cb6a8a82ff5fd5e
parent b55451dd8c2be2d462de176c69cf33c8d772c752
parent ad3f210b88465f5cb6ad68d42ac048c220ea8267
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583502149 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583502149 +0000

Merge "vpn: Fix NPE in VpnConfig#toString when no ProxyInfo is set" into rvc-dev am: 4cf6815168 am: d902a4f687 am: e4a234bc4f am: ad3f210b88

Change-Id: Ic580e0c51375e1f033e318db9b5c0fb56f451ec7