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

Change-Id: I29770d5b1b2b7510dca5c4b5b9e52faa626c3a8a
parents 7b58ba48 075cede6
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