| commit | cac83d87cf4e72c1d4722edbca5c33f1e3bee244 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Thu Oct 08 20:36:23 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 08 20:36:23 2015 +0000 |
| tree | ffb7b2d81ea2ee441863124268bfd559593a622f | |
| parent | b177e8a7559f61154a0560f7396ba9eeede80579 [diff] | |
| parent | d77dc131a0de4091f87b7356fca175d986a8b67e [diff] |
am d77dc131: am 91aa4a0a: (-s ours) am f106f9e4: am 15e991bd: resolved conflicts for 0b09da7a to lmp-mr1-dev * commit 'd77dc131a0de4091f87b7356fca175d986a8b67e': DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.