| commit | 7ea1ed8714248c1bada30424fb8097cd388c9ac7 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Thu Oct 08 20:06:54 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 08 20:06:54 2015 +0000 |
| tree | ad4f68934ac1f3dc1f20f9dedbccf89d1f6b75d7 | |
| parent | f106f9e4eacc1cb10ccc851a37619ed4b37bbb1b [diff] | |
| parent | 1b6bb62c51fc1e298d8184aafc9c9fd87d6501a9 [diff] |
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 '1b6bb62c51fc1e298d8184aafc9c9fd87d6501a9': DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.