tree f880d71f469b7c61495902a590dedf106b0fa4a9
parent 546f3cd579b80299307d82a769aca8e8f68484ec
parent 033e6c3a680cd42fb05738c87a8c514bb7e4963d
author Android (Google) Code Review <android-gerrit@google.com> 1252600766 -0400
committer Android (Google) Code Review <android-gerrit@google.com> 1252600766 -0400

Merge change 24450 into eclair

* changes:
  Minor API change in MPEG4Writer, support for amr output into MPEG4 containers.