| commit | 87b869ece20065ec3b47b350212e51f8cf866ff0 | [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 | f5055b253e0dbd33a72ee9411b96b8815343dd27 | |
| parent | f2cb45d4f8be94d791acfb9e15f35191d6eda996 [diff] | |
| parent | ec8b1a31660c03c68e25efc0eda1fb4a167dc260 [diff] |
Merge "VPN: temporarily disable the default proxy when VPN is active."