tree 2c3491674bb7e47bf1a78c0d0a7cd53b4c2b46a6
parent a7ad3f6c71ad6701fcaa6ecf75452563addb0dd0
parent b9ab71263ebff601a7c5e00258d92493de85fb36
author Dianne Hackborn <hackbod@google.com> 1258683811 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258683811 -0800

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