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