am 7acac10a: Merge "DO NOT MERGE: Add AUtils::isInRange, and use it to detect malform...

author Robert Shih <robertshih@google.com>

Mon, 11 May 2015 11:10:36 +0000 (11:10 +0000)

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

Mon, 11 May 2015 11:10:36 +0000 (11:10 +0000)
author Robert Shih <robertshih@google.com>
Mon, 11 May 2015 11:10:36 +0000 (11:10 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Mon, 11 May 2015 11:10:36 +0000 (11:10 +0000)
diff --cc media/libstagefright/MPEG4Extractor.cpp
Simple merge
author	Robert Shih <robertshih@google.com>
	Mon, 11 May 2015 11:10:36 +0000 (11:10 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Mon, 11 May 2015 11:10:36 +0000 (11:10 +0000)