tree 218df8d3f1177a52d667b3a3420f5953a15d4cbc
parent c876cc49947332a538d23d28eca25a76b8f33e93
parent 51e4ece385c6c34d97d5fa2dcc8e3b2c0bae7c22
author Irfan Sheriff <isheriff@google.com> 1365739177 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1365739177 +0000

Merge "Fix proxy and IP settings" into jb-mr2-dev