Merge "LiveSession: added onSwitchDown" into lmp-dev

author Robert Shih <robertshih@google.com>

Fri, 12 Sep 2014 18:24:02 +0000 (18:24 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Fri, 12 Sep 2014 18:24:02 +0000 (18:24 +0000)
author Robert Shih <robertshih@google.com>
Fri, 12 Sep 2014 18:24:02 +0000 (18:24 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 12 Sep 2014 18:24:02 +0000 (18:24 +0000)
diff --cc media/libstagefright/httplive/LiveSession.cpp
Simple merge
diff --cc media/libstagefright/httplive/LiveSession.h
Simple merge
author	Robert Shih <robertshih@google.com>
	Fri, 12 Sep 2014 18:24:02 +0000 (18:24 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 12 Sep 2014 18:24:02 +0000 (18:24 +0000)
		1	2
media/libstagefright/httplive/LiveSession.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
media/libstagefright/httplive/LiveSession.h	patch \|	diff1 \|	diff2 \|	blob \| history