tree 9d08a7f112c08117557a7dbc190deff26116d3d3
parent d77dc131a0de4091f87b7356fca175d986a8b67e
parent 867f877f6bd166e9a2adac7eaa1e10ba32d44087
author Wei Jia <wjia@google.com> 1444336149 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444336149 +0000

am 867f877f: (-s ours) am 7ea1ed87: am 1b6bb62c: am 07d70319: am 0b1936be: am dd184a48: (-s ours) am 3b4a72ac: Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer." into klp-dev

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