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

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

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

Change-Id: I0789a8deb45a949c8734fc317cd3d6d8a452d1d1
parents 369804d4 aa7b93b1
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