am 33e1ce41: am 2435eb9c: Avoid NPE when finding common MIME type.
Jeff Sharkey [Thu, 9 May 2013 23:28:28 +0000 (16:28 -0700)]
* commit '33e1ce41b46c65f679ce641d124ff9d8fce706ac':
  Avoid NPE when finding common MIME type.


Trivial merge