tree 00f39dc7ba1cc417a244e31fbf2f74cf27673ffc
parent 1520e9aeea89790738a746bbf0ac7689e5296ef2
parent c8c5e98b9ea0be4d161382fc537955d505e65a6c
author Andreas Huber <andih@google.com> 1340661187 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340661187 -0700

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

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