OSDN Git Service

am 624efe45: am c1b1709b: Merge "Make sure not to cancel pending seek/EOS notificatio...
authorAndreas Huber <andih@google.com>
Thu, 17 Nov 2011 21:20:16 +0000 (13:20 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Nov 2011 21:20:16 +0000 (13:20 -0800)
commit60047ae30cc816e98ddb4b0b48e58c34c3d1f486
tree6bbd2fd26a30192dd319f1a1ea93cb7ecdd545ed
parent1de4e2e1d7c22a31238e448200cbbe667cd5fa4c
parent7f2bec1f9b8acc105a5779b18ab180dbe59a1b00
am 624efe45: am c1b1709b: Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1

* commit '624efe45671131903fb5165f6133ba39486092ab':
  Make sure not to cancel pending seek/EOS notifications on a cache underrun...
media/libstagefright/AwesomePlayer.cpp