Merge "NuPlayer: Restrict seek on video texture changes" into lmp-dev

author Andy Hung <hunga@google.com>

Fri, 5 Sep 2014 21:49:32 +0000 (21:49 +0000)

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

Fri, 5 Sep 2014 21:49:33 +0000 (21:49 +0000)
author Andy Hung <hunga@google.com>
Fri, 5 Sep 2014 21:49:32 +0000 (21:49 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 5 Sep 2014 21:49:33 +0000 (21:49 +0000)
diff --cc media/libmediaplayerservice/nuplayer/NuPlayer.cpp
Simple merge
author	Andy Hung <hunga@google.com>
	Fri, 5 Sep 2014 21:49:32 +0000 (21:49 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 5 Sep 2014 21:49:33 +0000 (21:49 +0000)