| commit | 29e609a8c61b7c02d57495b71a4f82e7eb053dd6 | [log] [tgz] |
|---|---|---|
| author | Ronghua Wu <ronghuawu@google.com> | Wed Jan 28 23:20:26 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 28 23:20:26 2015 +0000 |
| tree | 3692ba7cd5206ae7cf00899155535b9531ed47e1 | |
| parent | 0bd5274ef93eae389cd7da89e163b1a5b67a47e1 [diff] | |
| parent | 628d4ea1622337de273ea0da3f89ab2bf2bb2faf [diff] |
am 628d4ea1: Merge "stagefright: do not reject SPL5 files outright in SoftMpeg4 decoder" into lmp-mr1-dev * commit '628d4ea1622337de273ea0da3f89ab2bf2bb2faf': stagefright: do not reject SPL5 files outright in SoftMpeg4 decoder