tree 0b8accc2d5b58e5121e60ec38a0a2b829f266455
parent aafb2587e78bf04145f2452570671d0275bd28ce
parent b326b75a948e6104526a21e903f862c139d233f5
author Dianne Hackborn <hackbod@google.com> 1296784251 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296784251 -0800

am 1b1962f3: Merge "Fix issue #3420898: More wallpaper issues" into honeycomb

* commit '1b1962f38304d2cbf12ac008791d93d3f1bdf0a6':
  Fix issue #3420898: More wallpaper issues