am 0fe24de8: am c0c2366c: Merge "stagefright: do not reject SPL4 files...
am 0fe24de8: am c0c2366c: Merge "stagefright: do not reject SPL4 files outright in SoftMpeg4 decoder" into lmp-mr1-dev
* commit '0fe24de8':
stagefright: do not reject SPL4 files outright in SoftMpeg4 decoder