Merge "NuPlayer: update timestamp handling" into lmp-dev

author Andy Hung <hunga@google.com>

Wed, 17 Sep 2014 23:31:37 +0000 (23:31 +0000)

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

Wed, 17 Sep 2014 23:31:38 +0000 (23:31 +0000)
author Andy Hung <hunga@google.com>
Wed, 17 Sep 2014 23:31:37 +0000 (23:31 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 17 Sep 2014 23:31:38 +0000 (23:31 +0000)
diff --cc media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
Simple merge
author	Andy Hung <hunga@google.com>
	Wed, 17 Sep 2014 23:31:37 +0000 (23:31 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 17 Sep 2014 23:31:38 +0000 (23:31 +0000)