OSDN Git Service

am 4c514f2a: am 594eeb08: Merge "Fix for the invalid Global Proxy Setting" into klp-dev
authorRobert Greenwalt <rgreenwalt@google.com>
Thu, 14 Nov 2013 00:29:12 +0000 (16:29 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 14 Nov 2013 00:29:12 +0000 (16:29 -0800)
commit7fdfe28c75e103b8a66b559dcb813576fbbf2eb5
tree26efd6a084a27dcc41e7e0781955072a932cf28e
parent1fbb5da29a4ebef1d758dffad9c2704a5932d223
parent4c514f2a688bdae319c919987092ccfee690f390
am 4c514f2a: am 594eeb08: Merge "Fix for the invalid Global Proxy Setting" into klp-dev

* commit '4c514f2a688bdae319c919987092ccfee690f390':
  Fix for the invalid Global Proxy Setting
services/java/com/android/server/ConnectivityService.java