diff options
| author | Tobias Thierer <tobiast@google.com> | 2019-10-04 06:46:14 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-10-04 06:46:14 -0700 |
| commit | 0cfa891678740efb4f8e432dbd39eb00738ef969 (patch) | |
| tree | 07670c193f73d009c5c62fff8536d3c53c534a1a /core/java/android | |
| parent | 79b96fd7234a5becc18e01dcef1b7b6cb1143823 (diff) | |
| parent | 0935b64e5b89fe29dadaebba6a9f33b011241b52 (diff) | |
Merge "Track MimeMap moving to libcore.content.type." am: 0801b7c222 am: 093c1e4eaa am: b43f746cdc
am: 0935b64e5b
Change-Id: I13997bf4f330d2ceb2d871b291729b4d78569ba2
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/webkit/MimeTypeMap.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/webkit/MimeTypeMap.java b/core/java/android/webkit/MimeTypeMap.java index fc23c54e834e..358fdc78c0a0 100644 --- a/core/java/android/webkit/MimeTypeMap.java +++ b/core/java/android/webkit/MimeTypeMap.java @@ -19,7 +19,7 @@ package android.webkit; import android.annotation.Nullable; import android.text.TextUtils; -import libcore.net.MimeMap; +import libcore.content.type.MimeMap; import java.util.regex.Pattern; |