OSDN Git Service

Merge "Query HTTP proxy for network via a new API to avoid permissions exceptions...
authorPaul Jensen <pauljensen@google.com>
Tue, 19 May 2015 17:58:10 +0000 (17:58 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 19 May 2015 17:58:11 +0000 (17:58 +0000)
commitc1a9436d27e41347e6063b1cfb77eaef7e191ca4
tree89f6a00598f3ca6a89fb6cd3521f044ad037d35b
parentbf45b3f4263768a420d92b320c5fb19697f5e9fb
parentcee9b51c4beec4494d78bab784ba7e7e20c30e31
Merge "Query HTTP proxy for network via a new API to avoid permissions exceptions" into mnc-dev
core/java/android/app/ActivityThread.java
core/java/android/net/ConnectivityManager.java
core/java/android/net/IConnectivityManager.aidl
services/core/java/com/android/server/ConnectivityService.java