resolved conflicts for merge of 998a929a to master

Change-Id: Id5cfbcf20e5ec28782cc88075040cf9edebfdfe8

diff --cc media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index 7191175,ea907c9..0059dc8
--- 1/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
--- 2/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@@ -538,9 -541,12 +541,12 @@@ void NuPlayer::finishFlushIfPossible() 
          return;
      }
  
 -    LOGV("both audio and video are flushed now.");
 +    ALOGV("both audio and video are flushed now.");
  
-     mRenderer->signalTimeDiscontinuity();
+     if (mTimeDiscontinuityPending) {
+         mRenderer->signalTimeDiscontinuity();
+         mTimeDiscontinuityPending = false;
+     }
  
      if (mAudioDecoder != NULL) {
          mAudioDecoder->signalResume();

diff --cc media/libstagefright/mpeg2ts/ATSParser.cpp
Simple merge

diff --cc media/libstagefright/mpeg2ts/AnotherPacketSource.cpp
Simple merge

diff --cc media/libstagefright/mpeg2ts/MPEG2PSExtractor.cpp
Simple merge