am f0e1fb59: am 4a492bf2: Fix integer underflow in covr MPEG4 processing

author Joshua J. Drake <android-open-source@qoop.org>

Fri, 5 Jun 2015 16:43:45 +0000 (16:43 +0000)

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

Fri, 5 Jun 2015 16:43:45 +0000 (16:43 +0000)
author Joshua J. Drake <android-open-source@qoop.org>
Fri, 5 Jun 2015 16:43:45 +0000 (16:43 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Fri, 5 Jun 2015 16:43:45 +0000 (16:43 +0000)
diff --cc media/libstagefright/MPEG4Extractor.cpp
Simple merge
author	Joshua J. Drake <android-open-source@qoop.org>
	Fri, 5 Jun 2015 16:43:45 +0000 (16:43 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 5 Jun 2015 16:43:45 +0000 (16:43 +0000)