am b9ab7126: am 524812fb: Merge change I7d40ad9a into eclair

Merge commit 'b9ab71263ebff601a7c5e00258d92493de85fb36' into eclair-mr2-plus-aosp

* commit 'b9ab71263ebff601a7c5e00258d92493de85fb36':
  More on issue #2271640: Fix wallpaper etc docs