summaryrefslogtreecommitdiffstats
path: root/core/java/android/webkit/WebView.java
diff options
context:
space:
mode:
authorJason Monk <jmonk@google.com>2013-09-18 13:09:33 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-18 13:09:33 -0700
commitab1fe9d51d5bc1e86726d495f7301f1ab9670220 (patch)
tree5398c1362f963d653c4a3d11a8b91a54388afd6d /core/java/android/webkit/WebView.java
parent7c4e91b133df4c66979617dc97b22e0726af57b4 (diff)
parentfd4cf80003095da1aa0bb17d0febde7d8da31e18 (diff)
downloadframeworks_base-ab1fe9d51d5bc1e86726d495f7301f1ab9670220.zip
frameworks_base-ab1fe9d51d5bc1e86726d495f7301f1ab9670220.tar.gz
frameworks_base-ab1fe9d51d5bc1e86726d495f7301f1ab9670220.tar.bz2
am fd4cf800: am 90701f1a: Merge "PAC Local Proxy to only receive lo connections" into klp-dev
* commit 'fd4cf80003095da1aa0bb17d0febde7d8da31e18': PAC Local Proxy to only receive lo connections
Diffstat (limited to 'core/java/android/webkit/WebView.java')
0 files changed, 0 insertions, 0 deletions