summaryrefslogtreecommitdiffstats
path: root/gallerycommon
diff options
context:
space:
mode:
authorYour Name <jreck@google.com>2012-11-27 16:07:55 -0800
committerYour Name <jreck@google.com>2012-11-27 16:07:55 -0800
commit48ac0347df314fe845a425d7a8645ce04b8a979d (patch)
treeedc2d13232e6c723c58b4509891b46f100bd3171 /gallerycommon
parent56f214d21ea696e8b5d721b64fa4958ab1bf6686 (diff)
parenta314235e093032c2d6cdd1f1d3f6b5c10c3e75a7 (diff)
downloadandroid_packages_apps_Snap-48ac0347df314fe845a425d7a8645ce04b8a979d.zip
android_packages_apps_Snap-48ac0347df314fe845a425d7a8645ce04b8a979d.tar.gz
android_packages_apps_Snap-48ac0347df314fe845a425d7a8645ce04b8a979d.tar.bz2
resolved conflicts for merge of 3c6a0610 to gb-ub-photos-bryce
Change-Id: Iac3fcc4a4b8c0295ec53edf5658169fb5fab021e
Diffstat (limited to 'gallerycommon')
0 files changed, 0 insertions, 0 deletions