tree 92b4e8670195759af044c8072485f434898ac0d7
parent ba5890a11e886149e2aca8f845251a92f2ea9a46
parent 371e121745c2e43e3c26fd1a854eaf6d3324f057
author Jean-Baptiste Queru <jbq@google.com> 1346437570 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346437570 -0700

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

* commit '371e121745c2e43e3c26fd1a854eaf6d3324f057':
  OMXCodec: enhance error handling of OMX IL client