summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2015-10-08 20:29:09 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-10-08 20:29:09 +0000
commita0f49d6922de21b31cf14959e0f2ddc12bf76857 (patch)
tree9d08a7f112c08117557a7dbc190deff26116d3d3 /services
parentd77dc131a0de4091f87b7356fca175d986a8b67e (diff)
parent867f877f6bd166e9a2adac7eaa1e10ba32d44087 (diff)
downloadframeworks_av-a0f49d6922de21b31cf14959e0f2ddc12bf76857.zip
frameworks_av-a0f49d6922de21b31cf14959e0f2ddc12bf76857.tar.gz
frameworks_av-a0f49d6922de21b31cf14959e0f2ddc12bf76857.tar.bz2
am 867f877f: (-s ours) am 7ea1ed87: am 1b6bb62c: am 07d70319: am 0b1936be: am dd184a48: (-s ours) am 3b4a72ac: Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer." into klp-dev
* commit '867f877f6bd166e9a2adac7eaa1e10ba32d44087': DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.
Diffstat (limited to 'services')
0 files changed, 0 insertions, 0 deletions