OSDN Git Service

Merge "Use CONNECTIVITY_INTERNAL for global proxy" into jb-mr2-dev
authorRobert Greenwalt <rgreenwalt@google.com>
Thu, 11 Apr 2013 21:11:44 +0000 (21:11 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 11 Apr 2013 21:11:44 +0000 (21:11 +0000)

Trivial merge