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

Merge commit '55df44f127375f3ce6bf310d327fffc187ec8f39' into eclair-mr2-plus-aosp

* commit '55df44f127375f3ce6bf310d327fffc187ec8f39':
  Clean up name of static wallpapers.