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