| commit | 07d7031928b2c878674d8cdaef2ad925ad4e7642 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Thu Oct 08 16:57:52 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 08 16:57:52 2015 +0000 |
| tree | 3ce7f90ca36c6d7b879f73f67650622fc06fcf16 | |
| parent | 0b09da7a98d5f55674dba7b380e1b8d262f709b0 [diff] | |
| parent | 0b1936bee532545381db6adf22f31ac437673f30 [diff] |
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 '0b1936bee532545381db6adf22f31ac437673f30': DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.