OSDN Git Service

am 3fd2a81e: Merge change 27410 into eclair
authorAndrew Stadler <stadler@android.com>
Mon, 28 Sep 2009 16:49:46 +0000 (09:49 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 28 Sep 2009 16:49:46 +0000 (09:49 -0700)
Merge commit '3fd2a81ec174f226c0b889e2679dd54e3c086d1c' into eclair-plus-aosp

* commit '3fd2a81ec174f226c0b889e2679dd54e3c086d1c':
  Add extension->mime type mappings


Trivial merge