OSDN Git Service

Merge "Fixed mimetype error of PPT file" am: 3c28e2b280 am: 148414cd2c
authorbokyung.kim <bokyung.kim@lge.com>
Mon, 28 Aug 2017 22:47:34 +0000 (22:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 28 Aug 2017 22:47:34 +0000 (22:47 +0000)
commit54238c6a100184b65ce03a0af9171d1e378d8918
treefea130c016099cc56e1d566e56b12cd14336dc1f
parentd194882e52aa7aece85c1a5340e9cffa0e017f2a
parent1190da1b1e7a470f4ab7994e57c512becaa86752
Merge "Fixed mimetype error of PPT file" am: 3c28e2b280 am: 148414cd2c
am: 1190da1b1e

Change-Id: I0eb5f50a6ac95d5512fbae9888b37a3c64917902
media/java/android/media/MediaFile.java