summaryrefslogtreecommitdiffstats
path: root/media/mediaserver
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@android.com>2012-10-17 14:59:40 -0700
committerGerrit Code Review <noreply-gerritcodereview@google.com>2012-10-17 14:59:40 -0700
commit6a2d62c1a972da25de53b1718c165f2b7df85a0e (patch)
tree6d653ee5b01f2322e86e47820495ba141b699128 /media/mediaserver
parentdbe1be24c9e6fb92a88a38adbd12a56aa5337f74 (diff)
parent4cb4f7ce9184de9a221239c28afcf912e7e1ed43 (diff)
downloadframeworks_av-6a2d62c1a972da25de53b1718c165f2b7df85a0e.zip
frameworks_av-6a2d62c1a972da25de53b1718c165f2b7df85a0e.tar.gz
frameworks_av-6a2d62c1a972da25de53b1718c165f2b7df85a0e.tar.bz2
Merge "Manually merge change #111620 from tc3 to mainline, to keep the"
Diffstat (limited to 'media/mediaserver')
0 files changed, 0 insertions, 0 deletions