tree 0d65770f2086d1ccc7196591fa00061df08a9482
parent 5f7cb2824f158d0dfdfcb68c9252e23d3df3f550
parent 43590eb76cac78f780dd318492c5fe6093e2fa88
author ztenghui <ztenghui@google.com> 1370023751 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1370023751 -0700

am 43590eb7: am 4f0002e6: Merge "MediaMuxer sample code update, no functional change" into jb-mr2-dev

* commit '43590eb76cac78f780dd318492c5fe6093e2fa88':
  MediaMuxer sample code update, no functional change