summaryrefslogtreecommitdiffstats
path: root/media/mediaserver
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2009-05-20 11:28:11 -0700
committerJean-Baptiste Queru <jbq@google.com>2009-05-20 11:28:11 -0700
commit3f52b1961f7a7185b204cacba836b8feb1215468 (patch)
tree567634d378a3f3d729da960eea1b228f412a7ad2 /media/mediaserver
parent4afdfa7fd7e9fe59fb298ef2ac252686e68bc73a (diff)
parentb206b934737c73b2ad243ebcad53f110d464819e (diff)
downloadframeworks_av-3f52b1961f7a7185b204cacba836b8feb1215468.zip
frameworks_av-3f52b1961f7a7185b204cacba836b8feb1215468.tar.gz
frameworks_av-3f52b1961f7a7185b204cacba836b8feb1215468.tar.bz2
reconcile donut snapshot
Merge branch 'donut-snapshot' into HEAD
Diffstat (limited to 'media/mediaserver')
0 files changed, 0 insertions, 0 deletions