tree 7b36ae052342fd3fdd122a1216bb452d0c7f7827
parent c0432b0d313d4a96854e27ab9d26a2d76473da60
parent 28dd605906a0e44361caffc65bce2edb14c661f3
author Marco Nelissen <marcone@google.com> 1444167843 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444167843 +0000

am 28dd6059: Merge "Fix benign overflow in OMXNodeInstance"

* commit '28dd605906a0e44361caffc65bce2edb14c661f3':
  Fix benign overflow in OMXNodeInstance