am 2b38a09f: am 23ef7b48: Fix most of issue #2271640: Fix wallpaper etc docs

Merge commit '2b38a09f044ad0bb14db7360b352fcca612f49ac' into eclair-mr2-plus-aosp

* commit '2b38a09f044ad0bb14db7360b352fcca612f49ac':
  Fix most of issue #2271640: Fix wallpaper etc docs