Skip to content
Commit 045ad910 authored by Geremy Condra's avatar Geremy Condra Committed by Android (Google) Code Review
Browse files

Merge changes Ia6646363,I94389b64 

* changes:
  Add per user VPN support
  Add NetworkUtil function for marking sockets
parents 648e4fc7 4ca19e83
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