tree 3f2f49907fc69e43fd4bc15357178497781975e7
parent ef76594348261be0959a83226c0b14cfbf7d3d28
parent a41541967ce2b762dc424efc922216f52f2b1af5
author James Dong <jdong@google.com> 1273086578 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1273086578 -0700

am 2518cd95: am 0835f067: Merge "Support audio and video track interleaving in the recorded mp4 file" into kraken