| commit | f106f9e4eacc1cb10ccc851a37619ed4b37bbb1b | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Thu Oct 08 20:06:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 08 20:06:51 2015 +0000 |
| tree | ad4f68934ac1f3dc1f20f9dedbccf89d1f6b75d7 | |
| parent | d4df7559c32d95707d2c04cbf8612db37d682ef6 [diff] | |
| parent | 15e991bdf8870c2c9820c2d98e0d30dae2e05a25 [diff] |
am 15e991bd: resolved conflicts for 0b09da7a to lmp-mr1-dev * commit '15e991bdf8870c2c9820c2d98e0d30dae2e05a25': DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.