Skip to content
Commit 075cede6 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: da7b5b0b

Change-Id: Ia0d3473950b7da0d8b635aec74c0500ac12b59ac
parents 0faf2444 da7b5b0b
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