am 466786b2: am 70cc5bdc: Merge changes Ic46e3069,Idc92716b into klp-dev

author Lajos Molnar <lajos@google.com>

Fri, 14 Mar 2014 05:14:33 +0000 (05:14 +0000)

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

Fri, 14 Mar 2014 05:14:33 +0000 (05:14 +0000)
author Lajos Molnar <lajos@google.com>
Fri, 14 Mar 2014 05:14:33 +0000 (05:14 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Fri, 14 Mar 2014 05:14:33 +0000 (05:14 +0000)
diff --cc media/libstagefright/httplive/LiveSession.cpp
Simple merge
diff --cc media/libstagefright/httplive/M3UParser.cpp
Simple merge
author	Lajos Molnar <lajos@google.com>
	Fri, 14 Mar 2014 05:14:33 +0000 (05:14 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 14 Mar 2014 05:14:33 +0000 (05:14 +0000)
		1	2
media/libstagefright/httplive/LiveSession.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
media/libstagefright/httplive/M3UParser.cpp	patch \|	diff1 \|	diff2 \|	blob \| history