diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2013-03-11 13:00:08 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-11 13:00:08 -0700 |
commit | 8a6077ce8fb417e94ba1ace84243cca6bb3944c3 (patch) | |
tree | f6963754bee3000f47369d0fa4328ab49d6d4e1e | |
parent | 6e7f0eedfc39e716a93c92f99481978dbbf1d597 (diff) | |
parent | f994bd3781b06eec0f993880baa2adf23c5af9fd (diff) | |
download | android_packages_screensavers_PhotoTable-8a6077ce8fb417e94ba1ace84243cca6bb3944c3.tar.gz android_packages_screensavers_PhotoTable-8a6077ce8fb417e94ba1ace84243cca6bb3944c3.tar.bz2 android_packages_screensavers_PhotoTable-8a6077ce8fb417e94ba1ace84243cca6bb3944c3.zip |
am f994bd37: am 8bf124f0: (-s ours) am ae812451: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'f994bd3781b06eec0f993880baa2adf23c5af9fd':
0 files changed, 0 insertions, 0 deletions