tree c63b34ee683140169b7598b2069e2fe46504a949
parent 550c2b7d39ef43f9a049fc65544f6d3f094f2fab
parent e90a1b16a3d6c559cb7fc47ad967a1810d88e923
author Jean-Baptiste Queru <jbq@google.com> 1293562839 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1293562839 -0800

am e90a1b16: am 752942ec: Merge "The phone is crashing when unknown mime content is transferred."

* commit 'e90a1b16a3d6c559cb7fc47ad967a1810d88e923':
  The phone is crashing when unknown mime content is transferred.