tree e5e05f30fbca34668d58ff6e6b3199a4ab947e3b
parent e6a823c276302b0c499d7a39956c1b731f23dd4c
parent 55f4bc5c3d1acfaa735b8b19cf34b6b68f6cfcca
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