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