summaryrefslogtreecommitdiffstats
path: root/media/ndk/NdkMediaCodec.cpp
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-12-29 17:26:53 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-29 17:26:53 +0000
commit5d0937c663a9c3a20ca981bedf0b75e7d110eb34 (patch)
tree59debb846921e75b255c2a2dd727999f9b5f0d2c /media/ndk/NdkMediaCodec.cpp
parent17f32a27930cec82d0eff4d5fe7932bd72c869bb (diff)
parent8564e13b37d372da78bce08f34a3610795ae173c (diff)
downloadframeworks_av-5d0937c663a9c3a20ca981bedf0b75e7d110eb34.zip
frameworks_av-5d0937c663a9c3a20ca981bedf0b75e7d110eb34.tar.gz
frameworks_av-5d0937c663a9c3a20ca981bedf0b75e7d110eb34.tar.bz2
am 8564e13b: resolved conflicts for merge of 2efb9566 to lmp-mr1-dev-plus-aosp
* commit '8564e13b37d372da78bce08f34a3610795ae173c': HLS: QCom enhancements
Diffstat (limited to 'media/ndk/NdkMediaCodec.cpp')
0 files changed, 0 insertions, 0 deletions