tree 0334aca65bfa0de3eaf4883d235aeb298b902c58
parent 08192d67bfa18b3a19627e8f3d713f918d61d8be
parent 1e303bb7d2ec6e531c93832a02050d9c8d79b9c5
author Daniel Sandler <dsandler@google.com> 1259815187 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259815187 -0800

am 1e303bb7: am 55df44f1: am 811954cf: Merge change I7df54f9d into eclair

Merge commit '1e303bb7d2ec6e531c93832a02050d9c8d79b9c5'

* commit '1e303bb7d2ec6e531c93832a02050d9c8d79b9c5':
  Clean up name of static wallpapers.