summaryrefslogtreecommitdiffstats
path: root/media/libmedia/IDataSource.cpp
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2015-10-08 20:36:24 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-10-08 20:36:24 +0000
commitd805214cec5219eef42346cc136effe89292ac69 (patch)
treeffb7b2d81ea2ee441863124268bfd559593a622f /media/libmedia/IDataSource.cpp
parentcac83d87cf4e72c1d4722edbca5c33f1e3bee244 (diff)
parenta0f49d6922de21b31cf14959e0f2ddc12bf76857 (diff)
downloadframeworks_av-d805214cec5219eef42346cc136effe89292ac69.zip
frameworks_av-d805214cec5219eef42346cc136effe89292ac69.tar.gz
frameworks_av-d805214cec5219eef42346cc136effe89292ac69.tar.bz2
am a0f49d69: 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 'a0f49d6922de21b31cf14959e0f2ddc12bf76857': DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.
Diffstat (limited to 'media/libmedia/IDataSource.cpp')
0 files changed, 0 insertions, 0 deletions