Commit a3ea288b 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: 9916d4b3 -s ours 

am: f751657a  -s ours

Change-Id: If474cfa932f6bff8065633a263987f3e28d64890
parents af957086 f751657a
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment