summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2010-08-10 10:48:59 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-10 10:48:59 -0700
commit898d5cdda2967938073d78cf3cd3135831451d3c (patch)
tree7ec9756434a21bfc2970ba24576e5f42a4c78a61 /core/java
parent7c997d209b59a4dbfc1e869ba1a9b3f3015613f8 (diff)
parenta04883412ec1a5dac3e83c3fd3c335ab9579a990 (diff)
downloadframeworks_base-898d5cdda2967938073d78cf3cd3135831451d3c.zip
frameworks_base-898d5cdda2967938073d78cf3cd3135831451d3c.tar.gz
frameworks_base-898d5cdda2967938073d78cf3cd3135831451d3c.tar.bz2
am a0488341: am 532d2ac5: Merge "Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer" into gingerbread
Merge commit 'a04883412ec1a5dac3e83c3fd3c335ab9579a990' * commit 'a04883412ec1a5dac3e83c3fd3c335ab9579a990': Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer
Diffstat (limited to 'core/java')
0 files changed, 0 insertions, 0 deletions