tree 79cebb1b6765eef913071f897e045f0448ced16f
parent d72ec85d1d0b92ed82927e3925f21912a659b799
parent a768b4f838f93823f661422d8193ebbff64b1b5a
author ztenghui <ztenghui@google.com> 1366051274 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366051274 -0700

am a768b4f8: am 8f1efee1: Merge "MediaMuxer prefer not to use the MPEG4Writer in real time recording mode." into jb-mr2-dev

* commit 'a768b4f838f93823f661422d8193ebbff64b1b5a':
  MediaMuxer prefer not to use the MPEG4Writer in real time recording mode.