Skip to content
Commit 16d3815a 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 am: bbbbc3d5 am: 5ed5753d

Change-Id: I29f4ede7d05b8d6846df67959da5451a17f61805
parents b2158c5a 5ed5753d
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