summaryrefslogtreecommitdiffstats
path: root/luni
diff options
context:
space:
mode:
authorBen Murdoch <benm@android.com>2014-12-11 13:11:07 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-12-11 13:11:08 +0000
commit7c9156a053fd560d3d50cfc2233007ed2eab92ff (patch)
tree7f8c98d262438ff1483a844c36fd1c1b464f629c /luni
parentb3073dfe99f6a51d49d798b107aaaf64b62f1bce (diff)
parent7da22a29061da1553687258af71373417f2ae196 (diff)
downloadlibcore-7c9156a053fd560d3d50cfc2233007ed2eab92ff.zip
libcore-7c9156a053fd560d3d50cfc2233007ed2eab92ff.tar.gz
libcore-7c9156a053fd560d3d50cfc2233007ed2eab92ff.tar.bz2
Merge "Add epub to MimeUtils map."
Diffstat (limited to 'luni')
-rw-r--r--luni/src/main/java/libcore/net/MimeUtils.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/luni/src/main/java/libcore/net/MimeUtils.java b/luni/src/main/java/libcore/net/MimeUtils.java
index 125ea87..b97e0d8 100644
--- a/luni/src/main/java/libcore/net/MimeUtils.java
+++ b/luni/src/main/java/libcore/net/MimeUtils.java
@@ -49,6 +49,7 @@ public final class MimeUtils {
add("application/andrew-inset", "ez");
add("application/dsptype", "tsp");
+ add("application/epub+zip", "epub");
add("application/hta", "hta");
add("application/mac-binhex40", "hqx");
add("application/mathematica", "nb");