tree dc5549dd12f226f569e594d07131ac79df92f4ce
parent 9966ca02bca37c392bb70fd62de77a7b4069e2d7
parent 3b3bc00202e383761dca010167df531f0fd98a03
author Dave Burke <daveburke@google.com> 1319089125 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1319089125 -0700

am 23d64420: Merge "Stagefright: idle OMX after ANW errors" into ics-mr0

* commit '23d644202a44383bf008ff86f6faa3ea7e447290':
  Stagefright: idle OMX after ANW errors