| commit | d805214cec5219eef42346cc136effe89292ac69 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Thu Oct 08 20:36:24 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 08 20:36:24 2015 +0000 |
| tree | ffb7b2d81ea2ee441863124268bfd559593a622f | |
| parent | cac83d87cf4e72c1d4722edbca5c33f1e3bee244 [diff] | |
| parent | a0f49d6922de21b31cf14959e0f2ddc12bf76857 [diff] |
am a0f49d69: 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 'a0f49d6922de21b31cf14959e0f2ddc12bf76857': DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.