am 29e609a8: am 628d4ea1: Merge "stagefright: do not reject SPL5 files...
am 29e609a8: am 628d4ea1: Merge "stagefright: do not reject SPL5 files outright in SoftMpeg4 decoder" into lmp-mr1-dev
* commit '29e609a8':
stagefright: do not reject SPL5 files outright in SoftMpeg4 decoder