am 6ff53b96: Merge "Prevent integer overflow when processing covr MPEG4 atoms" into...

author Wei Jia <wjia@google.com>

Fri, 5 Jun 2015 16:32:42 +0000 (16:32 +0000)

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

Fri, 5 Jun 2015 16:32:42 +0000 (16:32 +0000)
author Wei Jia <wjia@google.com>
Fri, 5 Jun 2015 16:32:42 +0000 (16:32 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Fri, 5 Jun 2015 16:32:42 +0000 (16:32 +0000)
diff --cc media/libstagefright/MPEG4Extractor.cpp
Simple merge
author	Wei Jia <wjia@google.com>
	Fri, 5 Jun 2015 16:32:42 +0000 (16:32 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 5 Jun 2015 16:32:42 +0000 (16:32 +0000)