OSDN Git Service

Merge "Guarantee that PAC Local Proxy owns Port" into klp-dev
authorJason Monk <jmonk@google.com>
Fri, 13 Sep 2013 20:31:53 +0000 (20:31 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 13 Sep 2013 20:31:54 +0000 (20:31 +0000)
commit312c495f4b8d002264772f61fe1fa3ef87bf3e52
tree8508f800432e603ae76330fa3d0c358fe4a85c03
parentcac2428da4a22d9526af09e1457a6b644b2c2057
parent6f8a68f49a7e8cf86104e721a1e8be7568b5f730
Merge "Guarantee that PAC Local Proxy owns Port" into klp-dev
Android.mk
services/java/com/android/server/ConnectivityService.java