OSDN Git Service

Merge change I9a50fdf4 into eclair-mr2
authorAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 6 Nov 2009 19:25:26 +0000 (14:25 -0500)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 6 Nov 2009 19:25:26 +0000 (14:25 -0500)
commitf28e0c2ac75bf630a595d442a7ddefcc1f8386f6
tree6fdaaba4b697236bfe76d78cc3c5e069cbb25250
parent300160edc936f2b8265900101136068e3912ff33
parent9a50fdf467fdd56bb97efc3bc0931a9e52b990a7
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.