summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorztenghui <ztenghui@google.com>2013-04-10 18:19:57 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-04-10 18:19:57 +0000
commit3eb2fb4dd2ede7f65ee307061213f0e8860f15f6 (patch)
tree99a4303ca7032c0b4169582e1953c567b1aaa808 /res
parent2fc6641b80a7aedf54062cbd01c40cbf0764a6ca (diff)
parent8b9de91b3c01664b24deda202acb5db8594db503 (diff)
downloadandroid_packages_apps_Gallery2-3eb2fb4dd2ede7f65ee307061213f0e8860f15f6.tar.gz
android_packages_apps_Gallery2-3eb2fb4dd2ede7f65ee307061213f0e8860f15f6.tar.bz2
android_packages_apps_Gallery2-3eb2fb4dd2ede7f65ee307061213f0e8860f15f6.zip
Merge "Use MediaMuxer for the video trim and mute." into gb-ub-photos-bryce
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions