Skip to content
Commit 9c47a359 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "vpn: Fix NPE in VpnConfig#toString when no ProxyInfo is set" into... 

Merge "vpn: Fix NPE in VpnConfig#toString when no ProxyInfo is set" into rvc-dev am: 4cf68151 am: d902a4f6 am: e4a234bc am: ad3f210b

Change-Id: Ic580e0c51375e1f033e318db9b5c0fb56f451ec7
parents b55451dd ad3f210b
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment