| commit | 5ba2e2cbb6ae3d470bf3031507ea938be6066ed7 | [log] [tgz] |
|---|---|---|
| author | Ronghua Wu <ronghuawu@google.com> | Thu Jan 29 17:20:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 29 17:20:56 2015 +0000 |
| tree | 0993879987b6e131fca608a69d1c436d8e075a29 | |
| parent | dee9d798a3434bde96852c60953cb531bf9fd18a [diff] | |
| parent | 2588b453fc170f0691d5c503dab2285fef6976c2 [diff] |
am 2588b453: am 29e609a8: am 628d4ea1: Merge "stagefright: do not reject SPL5 files outright in SoftMpeg4 decoder" into lmp-mr1-dev * commit '2588b453fc170f0691d5c503dab2285fef6976c2': stagefright: do not reject SPL5 files outright in SoftMpeg4 decoder