Merge "NuPlayer: check mSource before deferencing it." into lmp-dev

author Wei Jia <wjia@google.com>

Tue, 9 Sep 2014 19:43:15 +0000 (19:43 +0000)

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

Tue, 9 Sep 2014 19:43:16 +0000 (19:43 +0000)
author Wei Jia <wjia@google.com>
Tue, 9 Sep 2014 19:43:15 +0000 (19:43 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 9 Sep 2014 19:43:16 +0000 (19:43 +0000)
diff --cc media/libmediaplayerservice/nuplayer/NuPlayer.cpp
Simple merge
author	Wei Jia <wjia@google.com>
	Tue, 9 Sep 2014 19:43:15 +0000 (19:43 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 9 Sep 2014 19:43:16 +0000 (19:43 +0000)