summaryrefslogtreecommitdiffstats
path: root/cmds
diff options
context:
space:
mode:
authorRonghua Wu <ronghuawu@google.com>2015-01-29 17:20:56 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-29 17:20:56 +0000
commit5ba2e2cbb6ae3d470bf3031507ea938be6066ed7 (patch)
tree0993879987b6e131fca608a69d1c436d8e075a29 /cmds
parentdee9d798a3434bde96852c60953cb531bf9fd18a (diff)
parent2588b453fc170f0691d5c503dab2285fef6976c2 (diff)
downloadframeworks_av-5ba2e2cbb6ae3d470bf3031507ea938be6066ed7.zip
frameworks_av-5ba2e2cbb6ae3d470bf3031507ea938be6066ed7.tar.gz
frameworks_av-5ba2e2cbb6ae3d470bf3031507ea938be6066ed7.tar.bz2
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
Diffstat (limited to 'cmds')
0 files changed, 0 insertions, 0 deletions