Skip to content
Commit 1eaff3f1 authored by Varun Anand's avatar Varun Anand Committed by android-build-merger
Browse files

[automerger skipped] Merge "Update VPN capabilities when its underlying... 

[automerger skipped] Merge "Update VPN capabilities when its underlying network set is null." into pi-dev
am: b4b64ad6 -s ours
am skip reason: change_id Id0abc4d304bb096e92479a118168690ccce634ed with SHA1 4fa80e8a is in history

Change-Id: I8cdd422bf5686c707d60137eccb4e1caae8194a3
parents 5755d6ad b4b64ad6
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