tree 6f8069290744fb50ea485a80ecda5bf449d15a6d
parent 84ec55b736ae2278d6abdc1c7a0312de46ef5f3d
parent fa70cad40b01627ac1c22e04cdd548ece9c2654f
author Android (Google) Code Review <android-gerrit@google.com> 1257535526 -0500
committer Android (Google) Code Review <android-gerrit@google.com> 1257535526 -0500

Merge change I9a50fdf4 into eclair-mr2

* changes:
  Handle OMX_StateInvalid in emergency shutdown properly (by ignoring it and hoping for the best) instead of asserting.