summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2013-03-11 12:47:12 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-03-11 12:47:12 -0700
commitf994bd3781b06eec0f993880baa2adf23c5af9fd (patch)
treef6963754bee3000f47369d0fa4328ab49d6d4e1e
parent85756a88f29b41c29bf6ad10a32379f80f0df4d5 (diff)
parent8bf124f0aec220cb005be6c2941c9b17523b21d0 (diff)
downloadandroid_packages_screensavers_PhotoTable-f994bd3781b06eec0f993880baa2adf23c5af9fd.tar.gz
android_packages_screensavers_PhotoTable-f994bd3781b06eec0f993880baa2adf23c5af9fd.tar.bz2
android_packages_screensavers_PhotoTable-f994bd3781b06eec0f993880baa2adf23c5af9fd.zip
am 8bf124f0: (-s ours) am ae812451: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '8bf124f0aec220cb005be6c2941c9b17523b21d0':
0 files changed, 0 insertions, 0 deletions