tree 59508b8347c17d994b8e9ad929b591c9760fcd0d
parent d44b0df105f5204fa88002f5affa89d9882edd52
parent a8120ea311e298b61902b947a35876c173417770
author James Dong <jdong@google.com> 1314148095 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1314148095 -0700

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.