Merge "Track MimeMap moving to libcore.content.type."

am: 0801b7c222

Change-Id: I63889b3eedb8f98c99d71172dc5cc32025a8afd4

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;
 

core/java/com/android/internal/os/RuntimeInit.java

@@ -35,7 +35,7 @@ import com.android.server.NetworkManagementSocketTagger;
 import dalvik.system.RuntimeHooks;
 import dalvik.system.VMRuntime;
 
-import libcore.net.MimeMap;
+import libcore.content.type.MimeMap;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

core/java/com/android/internal/util/MimeIconUtils.java

@@ -27,7 +27,7 @@ import android.util.ArrayMap;
 import com.android.internal.R;
 import com.android.internal.annotations.GuardedBy;
 
-import libcore.net.MimeMap;
+import libcore.content.type.MimeMap;
 
 import java.util.Locale;
 import java.util.Objects;

media/java/android/media/MediaFile.java

@@ -23,7 +23,7 @@ import android.annotation.Nullable;
 import android.annotation.UnsupportedAppUsage;
 import android.mtp.MtpConstants;
 
-import libcore.net.MimeMap;
+import libcore.content.type.MimeMap;
 
 import java.util.HashMap;
 

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaFileTest.java

@@ -31,7 +31,7 @@ import android.mtp.MtpConstants;
 
 import androidx.test.runner.AndroidJUnit4;
 
-import libcore.net.MimeMap;
+import libcore.content.type.MimeMap;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

mime/java/android/content/type/DefaultMimeMapFactory.java

@@ -16,7 +16,7 @@
 
 package android.content.type;
 
-import libcore.net.MimeMap;
+import libcore.content.type.MimeMap;
 
 import java.io.BufferedReader;
 import java.io.IOException;