summaryrefslogtreecommitdiffstats
path: root/libvideoeditor
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2012-12-28 09:46:54 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-12-28 09:46:54 -0800
commit6f90c2b99cc6ec90c0e9a175d795edaf22f9d5bd (patch)
tree46753e1e575eff85921b9701089c40f6f7fb85ef /libvideoeditor
parentd5681bc9a38fe4cd1d591e6ae62b9c68fb851041 (diff)
parentcd2d263116576dc9770d31bb792e7cf2d6840b53 (diff)
downloadframeworks_av-6f90c2b99cc6ec90c0e9a175d795edaf22f9d5bd.zip
frameworks_av-6f90c2b99cc6ec90c0e9a175d795edaf22f9d5bd.tar.gz
frameworks_av-6f90c2b99cc6ec90c0e9a175d795edaf22f9d5bd.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