Merge "NuPlayerDecoder: postpone input message processing when it's not dequeued...

author Wei Jia <wjia@google.com>

Thu, 2 Oct 2014 23:18:49 +0000 (23:18 +0000)

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

Thu, 2 Oct 2014 23:18:50 +0000 (23:18 +0000)
author Wei Jia <wjia@google.com>
Thu, 2 Oct 2014 23:18:49 +0000 (23:18 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 2 Oct 2014 23:18:50 +0000 (23:18 +0000)
diff --cc media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
Simple merge
author	Wei Jia <wjia@google.com>
	Thu, 2 Oct 2014 23:18:49 +0000 (23:18 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 2 Oct 2014 23:18:50 +0000 (23:18 +0000)