tree 0e69335490ac13b6af4f626ae58208eadbe79c4c
parent d6496188145a37248f977836df0331e7f0ee96ce
parent 8d778b375ccb4945cdcd7cc93272a6d36466ad00
author Mathias Agopian <mathias@google.com> 1296268988 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296268988 -0800

am 8d778b37: am 231da079: Merge "fix [3389263] OMX.Nvidia.h264.decode fails to shutdown" into honeycomb

* commit '8d778b375ccb4945cdcd7cc93272a6d36466ad00':
  fix [3389263] OMX.Nvidia.h264.decode fails to shutdown