diff options
author | James Dong <jdong@google.com> | 2012-12-28 09:46:54 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-12-28 09:46:54 -0800 |
commit | 41aa725aa6c03b4ed814d0e2fcd30c7b6d2ad429 (patch) | |
tree | 38b4cd3972ae0424c389395524737c41cbdc7bec /libvideoeditor | |
parent | 856ff4e4c3c43550f013e80277358fdf514342bf (diff) | |
parent | 035f6c9c06791b75e6162433c6b2106d8f1851fb (diff) | |
download | frameworks_av-41aa725aa6c03b4ed814d0e2fcd30c7b6d2ad429.zip frameworks_av-41aa725aa6c03b4ed814d0e2fcd30c7b6d2ad429.tar.gz frameworks_av-41aa725aa6c03b4ed814d0e2fcd30c7b6d2ad429.tar.bz2 |
am cd2d2631: am b54cedab: Merge "Use default values when MPEG4 audio config parsing fails."
* commit 'cd2d263116576dc9770d31bb792e7cf2d6840b53':
Use default values when MPEG4 audio config parsing fails.
Diffstat (limited to 'libvideoeditor')
0 files changed, 0 insertions, 0 deletions