am d54261aa: Merge change Id6c0b844 into eclair

Merge commit 'd54261aab0a96defc9584c4c59a3218015cdb1f7' into eclair-plus-aosp

* commit 'd54261aab0a96defc9584c4c59a3218015cdb1f7':
  Unbreak setting photos as wallpaper