commit | c4f78f610098d237144eb2441cca5c60556704e2 | [log] [tgz] |
---|---|---|
author | Geremy Condra <gcondra@google.com> | Mon Jul 15 21:56:30 2013 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jul 15 21:56:30 2013 +0000 |
tree | c704c5f0052e881cac5abba845ecff794e655b2b | |
parent | 6fc25cfd156abe6225c8edf7892aba67f3e92168 [diff] | |
parent | ccae0d365b3ee464df078282c7484797eae5c2f9 [diff] |
Merge changes Ia6646363,I94389b64 * changes: Add per user VPN support Add NetworkUtil function for marking sockets