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