summaryrefslogtreecommitdiffstats
path: root/photoviewer
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-09-06 09:12:16 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-09-06 09:12:16 -0700
commit02b41fb77586917ca37e64a69e95597b4288a73c (patch)
treec313c3571e49cebc16b599f6801a37b9c26076b8 /photoviewer
parent367aa4681136d6e3d19864549859d7de60ec1010 (diff)
parentc2533e15791f540bdee32b26fa3f5eceaab6125e (diff)
downloadandroid_frameworks_ex-02b41fb77586917ca37e64a69e95597b4288a73c.tar.gz
android_frameworks_ex-02b41fb77586917ca37e64a69e95597b4288a73c.tar.bz2
android_frameworks_ex-02b41fb77586917ca37e64a69e95597b4288a73c.zip
am c2533e15: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'c2533e15791f540bdee32b26fa3f5eceaab6125e':
Diffstat (limited to 'photoviewer')
0 files changed, 0 insertions, 0 deletions