tree 320359866b29c5edcfe28ba98a34ca161ab6f493
parent 8223a7f0c4dd1119d05199f48fe70d854cd8b558
parent e8f2e4949f5047cd3b579b7cd1628a2b5b590fe0
author Elliott Hughes <enh@google.com> 1364238163 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364238163 -0700

am e8f2e494: Merge "MimeUtils\' list of MIME types should be in order of popularity."

* commit 'e8f2e4949f5047cd3b579b7cd1628a2b5b590fe0':
  MimeUtils' list of MIME types should be in order of popularity.