| commit | 867f877f6bd166e9a2adac7eaa1e10ba32d44087 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Thu Oct 08 20:10:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 08 20:10:40 2015 +0000 |
| tree | 26f92a59a28b761d463006f652634d583058dbfc | |
| parent | 91aa4a0aefa43ad53a20b3d4538a6a986c902818 [diff] | |
| parent | 7ea1ed8714248c1bada30424fb8097cd388c9ac7 [diff] |
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 '7ea1ed8714248c1bada30424fb8097cd388c9ac7': DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.