summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2015-10-08 16:53:23 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-10-08 16:53:23 +0000
commit0b1936bee532545381db6adf22f31ac437673f30 (patch)
tree42a880a82cd035f0f064456202796e8b0ef92c95 /include
parent04c02eeb0e5e5e4829df6946b275a770a8443330 (diff)
parentdd184a4824acc31160895e2c6f8d93a7facfc2c8 (diff)
downloadframeworks_av-0b1936bee532545381db6adf22f31ac437673f30.zip
frameworks_av-0b1936bee532545381db6adf22f31ac437673f30.tar.gz
frameworks_av-0b1936bee532545381db6adf22f31ac437673f30.tar.bz2
am dd184a48: (-s ours) am 3b4a72ac: Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer." into klp-dev
* commit 'dd184a4824acc31160895e2c6f8d93a7facfc2c8': DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions