summaryrefslogtreecommitdiffstats
path: root/media/mediaserver
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2009-07-21 14:38:36 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-07-21 14:38:36 -0700
commit8445fd927053268929125a6a9406ec3b622e2920 (patch)
tree3a88f4031f945844f30687aeec60d987594e979c /media/mediaserver
parente7656d6494a8cb45daeab03393dcb4fa264502c2 (diff)
parent54d6a3324203b76b185dcc53f39f245840438efc (diff)
downloadframeworks_av-8445fd927053268929125a6a9406ec3b622e2920.zip
frameworks_av-8445fd927053268929125a6a9406ec3b622e2920.tar.gz
frameworks_av-8445fd927053268929125a6a9406ec3b622e2920.tar.bz2
am db7db69a: Merge snapshot variant of donut back into main tree
Merge commit 'db7db69a2162439bf722d0f1f65429ca3ca19dcd' * commit 'db7db69a2162439bf722d0f1f65429ca3ca19dcd': donut snapshot
Diffstat (limited to 'media/mediaserver')
0 files changed, 0 insertions, 0 deletions