summaryrefslogtreecommitdiffstats
path: root/media/libmedia/mediaplayer.cpp
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2015-01-23 21:04:07 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-23 21:04:07 +0000
commitc1d224dec60ae6bab080752181d94cae9bf9749c (patch)
tree198b155c73cdc5ac077988d281989c7cd19c4d00 /media/libmedia/mediaplayer.cpp
parent5ee088f7a73d3afa052dff21a64f2b582497ef70 (diff)
parentd35c21207762c33c6f8f517e52533d6738d9adf0 (diff)
downloadframeworks_av-c1d224dec60ae6bab080752181d94cae9bf9749c.zip
frameworks_av-c1d224dec60ae6bab080752181d94cae9bf9749c.tar.gz
frameworks_av-c1d224dec60ae6bab080752181d94cae9bf9749c.tar.bz2
am d35c2120: am 1f7101ee: am 64c496c8: Merge "Fix MTP delete" into lmp-mr1-dev
* commit 'd35c21207762c33c6f8f517e52533d6738d9adf0': Fix MTP delete
Diffstat (limited to 'media/libmedia/mediaplayer.cpp')
0 files changed, 0 insertions, 0 deletions