tree 96e7fd612606424311873d34492def7da58bd6d8
parent be1480bade58688d201335860247734aec6b11cb
parent 7dae00baa6e8957be15523c46bb948bd1dde64c3
author Jamie Gennis <jgennis@google.com> 1319768041 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1319768041 +0000

am 08479cee: Merge "Stagefright: ANW::connect in MediaPlayerService" into ics-mr0

* commit '08479ceeba56c460fb52f60a24df27776f1936c3':
  Stagefright: ANW::connect in MediaPlayerService