summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Justin Ho <justinho@google.com> 2010-10-15 13:39:31 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-10-15 13:39:31 -0700
commitac2c85c0751da591c66d30b91a440fecc33000f0 (patch)
tree7e9ccef31a0f35a75e4e7b892a1ac363140f6acc
parente8b03c7f26db0a8ea803e7c736c28a967e2cedfe (diff)
parent353b80f4d6b844f90c8c18b559b6dd0181998414 (diff)
am d9fdcfda: (-s ours) am c9110970: Merge "Updated media transport controls" into gingerbread
Merge commit 'd9fdcfdaad2f8177f8fa2bed2d6bd978a28d7559' * commit 'd9fdcfdaad2f8177f8fa2bed2d6bd978a28d7559': Updated media transport controls
0 files changed, 0 insertions, 0 deletions