diff options
author | Ronghua Wu <ronghuawu@google.com> | 2015-01-28 23:29:17 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-28 23:29:17 +0000 |
commit | 2588b453fc170f0691d5c503dab2285fef6976c2 (patch) | |
tree | 7d99a467add927d5aa74a1a8f7f75c8b13327251 /cmds | |
parent | 0566949e25bdd541e969af0b5ce1aca405666d5a (diff) | |
parent | 29e609a8c61b7c02d57495b71a4f82e7eb053dd6 (diff) | |
download | frameworks_av-2588b453fc170f0691d5c503dab2285fef6976c2.zip frameworks_av-2588b453fc170f0691d5c503dab2285fef6976c2.tar.gz frameworks_av-2588b453fc170f0691d5c503dab2285fef6976c2.tar.bz2 |
am 29e609a8: am 628d4ea1: Merge "stagefright: do not reject SPL5 files outright in SoftMpeg4 decoder" into lmp-mr1-dev
* commit '29e609a8c61b7c02d57495b71a4f82e7eb053dd6':
stagefright: do not reject SPL5 files outright in SoftMpeg4 decoder
Diffstat (limited to 'cmds')
0 files changed, 0 insertions, 0 deletions