diff options
| author | Wei Jia <wjia@google.com> | 2015-10-08 20:06:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-08 20:06:51 +0000 |
| commit | f106f9e4eacc1cb10ccc851a37619ed4b37bbb1b (patch) | |
| tree | ad4f68934ac1f3dc1f20f9dedbccf89d1f6b75d7 /services | |
| parent | d4df7559c32d95707d2c04cbf8612db37d682ef6 (diff) | |
| parent | 15e991bdf8870c2c9820c2d98e0d30dae2e05a25 (diff) | |
| download | frameworks_av-f106f9e4eacc1cb10ccc851a37619ed4b37bbb1b.zip frameworks_av-f106f9e4eacc1cb10ccc851a37619ed4b37bbb1b.tar.gz frameworks_av-f106f9e4eacc1cb10ccc851a37619ed4b37bbb1b.tar.bz2 | |
am 15e991bd: resolved conflicts for 0b09da7a to lmp-mr1-dev
* commit '15e991bdf8870c2c9820c2d98e0d30dae2e05a25':
DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.
Diffstat (limited to 'services')
0 files changed, 0 insertions, 0 deletions