Skip to content
Commit 82f983a3 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

[automerger skipped] Merge "vpn: Fix NPE in VpnConfig#toString when no... 

[automerger skipped] Merge "vpn: Fix NPE in VpnConfig#toString when no ProxyInfo is set" am: ea11eb2a am: c62583fb -s ours
am skip reason: Change-Id I3f8dd1d232e2b18dae9e99eb05c92a797a2358b9 with SHA-1 c8922177 is in history

Change-Id: I5b45006cd29ab422a9cb028fbcc567398ad21b22
parents 4e55c0c8 c62583fb
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