tree 42a880a82cd035f0f064456202796e8b0ef92c95
parent 04c02eeb0e5e5e4829df6946b275a770a8443330
parent dd184a4824acc31160895e2c6f8d93a7facfc2c8
author Wei Jia <wjia@google.com> 1444323203 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444323203 +0000

am dd184a48: (-s ours) am 3b4a72ac: Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer." into klp-dev

* commit 'dd184a4824acc31160895e2c6f8d93a7facfc2c8':
  DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.