tree b585425194917cb35fd946e3cffcbe962a9d849e
parent 25821afa056db40cb501e0bc00e98757153856bd
parent 9d9a645b22a264e740b5a93ac1cddda594d36181
author Dianne Hackborn <hackbod@google.com> 1258657715 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258657715 -0800

am 9d9a645b: Fix issue #2271640: Fix wallpaper etc docs

Merge commit '9d9a645b22a264e740b5a93ac1cddda594d36181' into eclair-mr2

* commit '9d9a645b22a264e740b5a93ac1cddda594d36181':
  Fix issue #2271640: Fix wallpaper etc docs