am c5624813: am 6ee7b04d: Merge change 25192 into eclair

Merge commit 'c562481380a4f5ddffc67dd72d81e2ded5bd201f'

* commit 'c562481380a4f5ddffc67dd72d81e2ded5bd201f':
  Some improvements for wallpaper configuration.