diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-10-08 22:48:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-08 22:48:44 +0000 |
| commit | 529b78941c20c2b45312eeedbd509d0ded4f7323 (patch) | |
| tree | 1aff9a9aac271e48dec04cb986c5cadc5f4105e9 /core/java/android/webkit/WebView.java | |
| parent | 511925c9e143ebc6eeb0efdf433cc0519b5e5eb1 (diff) | |
| parent | 89b196958fee07475765bd3c458098464ba16f2e (diff) | |
am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev
* commit '89b196958fee07475765bd3c458098464ba16f2e':
Put in real "code" (aka marketing) name.
Diffstat (limited to 'core/java/android/webkit/WebView.java')
| -rw-r--r-- | core/java/android/webkit/WebView.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 68f5dada9244..592d6e27e599 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -25,7 +25,6 @@ import android.graphics.Paint; import android.graphics.Picture; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.net.Uri; import android.net.http.SslCertificate; import android.os.Build; import android.os.Bundle; @@ -1754,7 +1753,7 @@ public class WebView extends AbsoluteLayout * safety. * </li> * <li> The Java object's fields are not accessible.</li> - * <li> For applications targeted to API level {@link android.os.Build.VERSION_CODES#L} + * <li> For applications targeted to API level {@link android.os.Build.VERSION_CODES#LOLLIPOP} * and above, methods of injected Java objects are enumerable from * JavaScript.</li> * </ul> |