OSDN Git Service

Merge "Fix proxy and IP settings" into jb-mr2-dev
authorIrfan Sheriff <isheriff@google.com>
Fri, 12 Apr 2013 03:59:37 +0000 (03:59 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 12 Apr 2013 03:59:37 +0000 (03:59 +0000)

Trivial merge