tree 18392c33567980ddbb6fc193817113489027f335
parent da69f1c26bff1729331456db7e9c933bf82663d0
parent 8f1efee1c17e997af5ea3c46c62b3ae106b18264
author ztenghui <ztenghui@google.com> 1366051152 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366051152 -0700

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

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