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