tree c704c5f0052e881cac5abba845ecff794e655b2b
parent 6fc25cfd156abe6225c8edf7892aba67f3e92168
parent ccae0d365b3ee464df078282c7484797eae5c2f9
author Geremy Condra <gcondra@google.com> 1373925390 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1373925390 +0000

Merge changes Ia6646363,I94389b64

* changes:
  Add per user VPN support
  Add NetworkUtil function for marking sockets