Merge "NuPlayer: Fix decoder error handling" into lmp-dev

author Andy Hung <hunga@google.com>

Thu, 25 Sep 2014 03:50:45 +0000 (03:50 +0000)

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

Thu, 25 Sep 2014 03:50:46 +0000 (03:50 +0000)
author Andy Hung <hunga@google.com>
Thu, 25 Sep 2014 03:50:45 +0000 (03:50 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 25 Sep 2014 03:50:46 +0000 (03:50 +0000)
diff --cc media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
Simple merge
author	Andy Hung <hunga@google.com>
	Thu, 25 Sep 2014 03:50:45 +0000 (03:50 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 25 Sep 2014 03:50:46 +0000 (03:50 +0000)