tree 92b4e8670195759af044c8072485f434898ac0d7
parent fa7a5158b50d9acb2b1dfc0fd7b70adb646e007c
parent 86a520036e0522b8c36b3e7f1187c2d4e473c6ea
author Jean-Baptiste Queru <jbq@google.com> 1346437685 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346437685 -0700

am 6bcdca03: am 371e1217: (-s ours) am 8b152566: Merge "OMXCodec: enhance error handling of OMX IL client"

* commit '6bcdca035d4e9f7b2aee2d3febd8e2df5f57ae6f':
  OMXCodec: enhance error handling of OMX IL client