summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-11-06 12:19:00 -0800
committerThe Android Open Source Project <initial-contribution@android.com>2012-11-06 12:19:00 -0800
commitc39ee4748b1398080241955f3ed09915afe31c5f (patch)
tree6fb727ccda1a7478567c1be879721b2c5addab07
parentb6c75a5e1a9dfc7753a451e97607510d37264374 (diff)
parentaa4543e73bece31146c9d8f7f0b573f3ffe154c8 (diff)
parent3f0216eba29e75cdad2091ddb23b92335e9e68b9 (diff)
downloadandroid_packages_screensavers_PhotoTable-c39ee4748b1398080241955f3ed09915afe31c5f.tar.gz
android_packages_screensavers_PhotoTable-c39ee4748b1398080241955f3ed09915afe31c5f.tar.bz2
android_packages_screensavers_PhotoTable-c39ee4748b1398080241955f3ed09915afe31c5f.zip
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: Iff4148b0409ebaeb03ffb6998ce9624623c9c180