Merge "httplive: timestamp reporting, track selection" into lmp-dev

author Robert Shih <robertshih@google.com>

Wed, 6 Aug 2014 23:19:17 +0000 (23:19 +0000)

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

Wed, 6 Aug 2014 17:14:55 +0000 (17:14 +0000)
author Robert Shih <robertshih@google.com>
Wed, 6 Aug 2014 23:19:17 +0000 (23:19 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 6 Aug 2014 17:14:55 +0000 (17:14 +0000)
diff --cc media/libmediaplayerservice/nuplayer/GenericSource.cpp
Simple merge
author	Robert Shih <robertshih@google.com>
	Wed, 6 Aug 2014 23:19:17 +0000 (23:19 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 6 Aug 2014 17:14:55 +0000 (17:14 +0000)