am 510180f1: am 08e42967: Merge "Add support for retrieving location information...

author James Dong <jdong@google.com>

Fri, 11 Nov 2011 15:34:21 +0000 (15:34 +0000)

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

Fri, 11 Nov 2011 15:34:21 +0000 (15:34 +0000)
author James Dong <jdong@google.com>
Fri, 11 Nov 2011 15:34:21 +0000 (15:34 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Fri, 11 Nov 2011 15:34:21 +0000 (15:34 +0000)
diff --cc media/libstagefright/MPEG4Extractor.cpp
Simple merge
diff --cc media/libstagefright/StagefrightMetadataRetriever.cpp
Simple merge
author	James Dong <jdong@google.com>
	Fri, 11 Nov 2011 15:34:21 +0000 (15:34 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 11 Nov 2011 15:34:21 +0000 (15:34 +0000)
		1	2
media/libstagefright/MPEG4Extractor.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
media/libstagefright/StagefrightMetadataRetriever.cpp	patch \|	diff1 \|	diff2 \|	blob \| history