am ff1c3128: Finish issue #2271640: Fix wallpaper etc docs

Merge commit 'ff1c31282452dc87b1dbd1e4391216b080745135' into eclair-mr2

* commit 'ff1c31282452dc87b1dbd1e4391216b080745135':
  Finish issue #2271640: Fix wallpaper etc docs