summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/ActivityManager.cpp
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2012-08-03 14:20:20 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-03 14:20:20 -0700
commit1ebccf52559ee7249bfe25c1a7c0232f8bc8060f (patch)
tree1a5eb5db7a9fe3e196bed3cf5a1346ccdfd637d4 /media/libmediaplayerservice/ActivityManager.cpp
parent27644634ea54d48863e765d87e24d60153a6e795 (diff)
parentc9b125a1be3d1edcb8b7f050334ef3d3a980d3d1 (diff)
downloadframeworks_av-1ebccf52559ee7249bfe25c1a7c0232f8bc8060f.zip
frameworks_av-1ebccf52559ee7249bfe25c1a7c0232f8bc8060f.tar.gz
frameworks_av-1ebccf52559ee7249bfe25c1a7c0232f8bc8060f.tar.bz2
am c9b125a1: am a3b71fa5: Merge "experimental support for fragmented mp4 playback in nuplayer" into jb-mr1-dev
* commit 'c9b125a1be3d1edcb8b7f050334ef3d3a980d3d1': experimental support for fragmented mp4 playback in nuplayer
Diffstat (limited to 'media/libmediaplayerservice/ActivityManager.cpp')
0 files changed, 0 insertions, 0 deletions