summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/MediaCodec.cpp
diff options
context:
space:
mode:
authorChong Zhang <chz@google.com>2014-09-24 18:36:40 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-24 18:36:40 +0000
commit9f57f923fb46cb51aba3d29bfa74cb08aa542e17 (patch)
tree4b9766c82081a47891367009069a7ecd4de0cff8 /media/libstagefright/MediaCodec.cpp
parent3c8a4633c92205b4eea17c01e6a5e58bbe42790f (diff)
parentc81633f483b2e75962800a4dde2a0eec779b0ad0 (diff)
downloadframeworks_av-9f57f923fb46cb51aba3d29bfa74cb08aa542e17.zip
frameworks_av-9f57f923fb46cb51aba3d29bfa74cb08aa542e17.tar.gz
frameworks_av-9f57f923fb46cb51aba3d29bfa74cb08aa542e17.tar.bz2
am c81633f4: am 846202f5: Merge "NuCachedSource2: more fixes for source read hang" into lmp-dev
* commit 'c81633f483b2e75962800a4dde2a0eec779b0ad0': NuCachedSource2: more fixes for source read hang
Diffstat (limited to 'media/libstagefright/MediaCodec.cpp')
0 files changed, 0 insertions, 0 deletions