am a8120ea3: Merge "To make SniffMP3() more concrete so that we can remove false-positve responses from MPEG-PS streams."
am a8120ea3: Merge "To make SniffMP3() more concrete so that we can remove false-positve responses from MPEG-PS streams."

* commit 'a8120ea311e298b61902b947a35876c173417770':
  To make SniffMP3() more concrete so that we can remove false-positve responses from MPEG-PS streams.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base