Skip to content
Commit b55451dd 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 am: 4b6b9707 am: 0230c6e2

Change-Id: I10de38c137ba8c5d23c10d3e6adbdd0c25add610
parents 579e0141 0230c6e2
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