summaryrefslogtreecommitdiffstats
path: root/gallerycommon
diff options
context:
space:
mode:
authorBart Sears <bsears@google.com>2012-12-18 12:58:15 -0800
committerBart Sears <bsears@google.com>2012-12-18 12:58:15 -0800
commit97cb71043e8dc15948c7dc663504966ff988c4d1 (patch)
tree809e319f07846567e26fa487723c5ee230c0f819 /gallerycommon
parent04359d5ddb1c69da3671ca285553d51b846c4fe2 (diff)
parent2b5021d525229c759f0b57b8a607520d081a3084 (diff)
downloadandroid_packages_apps_Snap-97cb71043e8dc15948c7dc663504966ff988c4d1.zip
android_packages_apps_Snap-97cb71043e8dc15948c7dc663504966ff988c4d1.tar.gz
android_packages_apps_Snap-97cb71043e8dc15948c7dc663504966ff988c4d1.tar.bz2
resolved conflicts for merge of 5b188c94 to gb-ub-photos-bryce
Change-Id: I0b39e54323c8f2ce67816ec223acf72cfacbd191
Diffstat (limited to 'gallerycommon')
0 files changed, 0 insertions, 0 deletions