Merge "LiveSession: do not drop seek request" into lmp-dev

author Robert Shih <robertshih@google.com>

Thu, 25 Sep 2014 00:11:20 +0000 (00:11 +0000)

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

Thu, 25 Sep 2014 00:11:21 +0000 (00:11 +0000)
author Robert Shih <robertshih@google.com>
Thu, 25 Sep 2014 00:11:20 +0000 (00:11 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 25 Sep 2014 00:11:21 +0000 (00:11 +0000)
diff --cc media/libstagefright/httplive/LiveSession.cpp
Simple merge
author	Robert Shih <robertshih@google.com>
	Thu, 25 Sep 2014 00:11:20 +0000 (00:11 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 25 Sep 2014 00:11:21 +0000 (00:11 +0000)