am 801726ef: Merge "MPEG4Writer: Write a zero-length compressor string"

author Andreas Huber <andih@google.com>

Wed, 27 Feb 2013 17:59:00 +0000 (17:59 +0000)

committer Android Git Automerger <android-git-automerger@android.com>

Wed, 27 Feb 2013 17:59:00 +0000 (17:59 +0000)
author Andreas Huber <andih@google.com>
Wed, 27 Feb 2013 17:59:00 +0000 (17:59 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Wed, 27 Feb 2013 17:59:00 +0000 (17:59 +0000)
diff --cc media/libstagefright/MPEG4Writer.cpp

index 14986b2,326930f..056b47a

mode 100644,100755..100644
--- 1/media/libstagefright/MPEG4Writer.cpp
--- 2/media/libstagefright/MPEG4Writer.cpp
+++ b/media/libstagefright/MPEG4Writer.cpp
author	Andreas Huber <andih@google.com>
	Wed, 27 Feb 2013 17:59:00 +0000 (17:59 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Wed, 27 Feb 2013 17:59:00 +0000 (17:59 +0000)