summaryrefslogtreecommitdiffstats
path: root/media/mediaserver
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2009-05-20 11:49:58 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-05-20 11:49:58 -0700
commit8bae84582c2836a605d3ec3382a5e2f0b233ca52 (patch)
treefc13e8547ac0f13cf2f3c220b738a23033bbf32b /media/mediaserver
parent94787a73363a3fea461443389a6cbb05858923e0 (diff)
parent3f52b1961f7a7185b204cacba836b8feb1215468 (diff)
downloadframeworks_av-8bae84582c2836a605d3ec3382a5e2f0b233ca52.zip
frameworks_av-8bae84582c2836a605d3ec3382a5e2f0b233ca52.tar.gz
frameworks_av-8bae84582c2836a605d3ec3382a5e2f0b233ca52.tar.bz2
am d3f14a62: reconcile donut snapshot
Merge commit 'd3f14a625e74a93e52b8b9aa5363a5de50129ea9' * commit 'd3f14a625e74a93e52b8b9aa5363a5de50129ea9': donut snapshot
Diffstat (limited to 'media/mediaserver')
0 files changed, 0 insertions, 0 deletions