summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-11-29 09:49:32 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-29 09:49:32 -0800
commit0d901d057e4f15b3893117886f7ae76b128734ab (patch)
treeca95440abeffdd11aeefd3db48b5e0f59c6b888c
parent0c220c90e5cd805c98f8c82b16007a27791c1ba8 (diff)
parente749c32a866b41702168812430ea74201c23e687 (diff)
downloadandroid_packages_screensavers_PhotoTable-0d901d057e4f15b3893117886f7ae76b128734ab.tar.gz
android_packages_screensavers_PhotoTable-0d901d057e4f15b3893117886f7ae76b128734ab.tar.bz2
android_packages_screensavers_PhotoTable-0d901d057e4f15b3893117886f7ae76b128734ab.zip
am e749c32a: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit 'e749c32a866b41702168812430ea74201c23e687':
0 files changed, 0 insertions, 0 deletions