commit fa5004571b65826f9245e49248fd8e83e8008d73
author James Dong <jdong@google.com> Tue Mar 30 09:57:05 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 30 09:57:05 2010 -0700
tree f90a3f74e30c61e8d7f47a276cda1513b0db5bb3
parent 7eb36421a3d287a51bd6be02a30bafd91d90ea4b
parent a7b22907b3fe1a2d644e8ef023bf8d8fde16f99e

am a7b22907: Fix a bug where the conditional wait is not correct for state transition from OMX_StateIdle to OMX_StateLoaded In addition, since we have already returned all buffers to the client after completing the state transition from OMX_StateExecuting to OMX_State

Merge commit 'a7b22907b3fe1a2d644e8ef023bf8d8fde16f99e' into froyo-plus-aosp

* commit 'a7b22907b3fe1a2d644e8ef023bf8d8fde16f99e':
  Fix a bug where the conditional wait is not correct for state transition from OMX_StateIdle to OMX_StateLoaded