| commit | ec49c919290919459a900110d8325cc232bf8cdf | [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 | e70d28d1dfcbb099df3e9be68e0688a03a127cfc | |
| parent | f386f9ec7e806cc99449f36543fddba6964b07f1 [diff] | |
| parent | 763a11c5bd787bb3221ac22cc6506b4e81625fb9 [diff] |
Merge "VPN: temporarily disable the default proxy when VPN is active."