tree 83bc994dc89a922a65fc0807078ea7c83186b662
parent 9da69580848664ce69dd4237608d5e59b36a6833
parent 6dfd6aec2730bfdde6da646dafa8597a34a17b4e
author Andreas Huber <andih@google.com> 1340661366 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340661366 -0700

am 6dfd6aec: am c8c5e98b: Merge "Document some of the more common mimetypes to be used when instantiating" into jb-dev

* commit '6dfd6aec2730bfdde6da646dafa8597a34a17b4e':
  Document some of the more common mimetypes to be used when instantiating