Skip to content
Commit d11ca759 authored by Rubin Xu's avatar Rubin Xu Committed by android-build-merger
Browse files

[automerger skipped] Merge "Support seamless handover between VPN fds." am:... 

[automerger skipped] Merge "Support seamless handover between VPN fds." am: 9916d4b3  -s ours am: f751657a  -s ours
am: a3ea288b  -s ours

Change-Id: If19c98d0becb9b1e788f6a7196f14211a52d2610
parents 73c35f84 a3ea288b
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