am d6ea7f65: am f26400c9: Fix crash on malformed id3

author Marco Nelissen <marcone@google.com>

Fri, 7 Aug 2015 14:32:40 +0000 (14:32 +0000)

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

Fri, 7 Aug 2015 14:32:40 +0000 (14:32 +0000)
author Marco Nelissen <marcone@google.com>
Fri, 7 Aug 2015 14:32:40 +0000 (14:32 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Fri, 7 Aug 2015 14:32:40 +0000 (14:32 +0000)
diff --cc include/media/stagefright/MetaData.h
Simple merge
diff --cc media/libstagefright/MetaData.cpp
Simple merge
diff --cc media/libstagefright/id3/ID3.cpp
Simple merge
author	Marco Nelissen <marcone@google.com>
	Fri, 7 Aug 2015 14:32:40 +0000 (14:32 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 7 Aug 2015 14:32:40 +0000 (14:32 +0000)
		1	2
include/media/stagefright/MetaData.h	patch \|	diff1 \|	diff2 \|	blob \| history
media/libstagefright/MetaData.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
media/libstagefright/id3/ID3.cpp	patch \|	diff1 \|	diff2 \|	blob \| history