tree 777dafeaa07330634f087024b885973f20697203
parent 700142f66bf8f8f14ed25a6a9f67f6c1f44a3dbc
parent 81cb2d1800a0a0aced83225f7f923b0809211001
author John Reck <jreck@android.com> 1347991816 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1347991816 -0700

am 81cb2d18: Merge "Don\'t replace file extension when mime-type is incorrect"

* commit '81cb2d1800a0a0aced83225f7f923b0809211001':
  Don't replace file extension when mime-type is incorrect