Merge "NuPlayer: add support for proper stop" into lmp-dev

author Lajos Molnar <lajos@google.com>

Tue, 19 Aug 2014 17:54:04 +0000 (17:54 +0000)

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

Tue, 19 Aug 2014 02:43:23 +0000 (02:43 +0000)
author Lajos Molnar <lajos@google.com>
Tue, 19 Aug 2014 17:54:04 +0000 (17:54 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 19 Aug 2014 02:43:23 +0000 (02:43 +0000)
diff --cc media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
Simple merge
diff --cc media/libmediaplayerservice/nuplayer/NuPlayerDriver.h
Simple merge
author	Lajos Molnar <lajos@google.com>
	Tue, 19 Aug 2014 17:54:04 +0000 (17:54 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 19 Aug 2014 02:43:23 +0000 (02:43 +0000)
		1	2
media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
media/libmediaplayerservice/nuplayer/NuPlayerDriver.h	patch \|	diff1 \|	diff2 \|	blob \| history