OSDN Git Service

am 9e0fdfec: Merge "Simplify proxy regex" into jb-mr1-dev
authorIrfan Sheriff <isheriff@google.com>
Wed, 22 Aug 2012 21:24:20 +0000 (14:24 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 22 Aug 2012 21:24:20 +0000 (14:24 -0700)
commitaea749fa94f9d1c0b5dd7c16247b8c2eeca23462
tree2498baa4485ea1a856fa6c42cb938a4896f10067
parent5a2dce6092c9686f285652da42ca8d0556b7b17d
parent9e0fdfec70f181ec71198822fa39e749248c5f87
am 9e0fdfec: Merge "Simplify proxy regex" into jb-mr1-dev

* commit '9e0fdfec70f181ec71198822fa39e749248c5f87':
  Simplify proxy regex