OSDN Git Service

Merge "Simplify proxy regex" into jb-mr1-dev
authorIrfan Sheriff <isheriff@google.com>
Wed, 22 Aug 2012 21:21:41 +0000 (14:21 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 22 Aug 2012 21:21:41 +0000 (14:21 -0700)

Trivial merge