diff options
| author | Andreas Gampe <agampe@google.com> | 2014-10-29 17:47:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-29 17:47:10 +0000 |
| commit | 955bee89abada8b6541f499c686376d4434242b1 (patch) | |
| tree | ad54b9608db1be2c23432ef81333e86db5c8c78b /core/java/android/net/Proxy.java | |
| parent | 263829e0e794f48335db2f49078c53fe10292e98 (diff) | |
| parent | dfdc6acc4809f395b9db2136acc89b6de932a1a5 (diff) | |
| download | frameworks_base-955bee89abada8b6541f499c686376d4434242b1.zip frameworks_base-955bee89abada8b6541f499c686376d4434242b1.tar.gz frameworks_base-955bee89abada8b6541f499c686376d4434242b1.tar.bz2 | |
am dfdc6acc: resolved conflicts for merge of 3c8cf51f into stage-aosp-master
* commit 'dfdc6acc4809f395b9db2136acc89b6de932a1a5':
Stop using apache http to download Gps XTRA data.
Diffstat (limited to 'core/java/android/net/Proxy.java')
0 files changed, 0 insertions, 0 deletions