| commit | b74931559b9e95b22ea632c243acda19fe8ea82c | [log] [tgz] |
|---|---|---|
| author | Chia-chi Yeh <chiachi@android.com> | Thu Oct 06 15:29:50 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Oct 06 15:29:50 2011 -0700 |
| tree | 6eba00f976e2f803b871a5dd1f6d67b3b732bd8e | |
| parent | 893783ed8768a98cbfea09c4e60093e2580dd22b [diff] | |
| parent | 4c12a47bffc51868285b17db9f00d40affc7c9e3 [diff] |
Merge "VPN: temporarily disable the default proxy when VPN is active."