OSDN Git Service

Merge "Add proxy as another network." into klp-modular-dev
authorHui Lu <huilu@google.com>
Thu, 30 Jan 2014 22:58:48 +0000 (22:58 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 30 Jan 2014 22:58:48 +0000 (22:58 +0000)

Trivial merge