tree d2b59fd587a854693cad41fa8e071da1c5724137
parent 964eda2dd9e72dfaa6ff53c0b94fbf98ddb75132
parent 8284de3be2ac07d8774b15e6565df5aba084db04
author Robert Shih <robertshih@google.com> 1391464344 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1391464345 +0000

Merge "MPEG4Writer: use "mp42" as major/minor brand in ftyp box."