tree ffc39c182fdefa4a8466328d0b3dfe1fc7b88c6e
parent 5973cbc163e9d12782c7003bc2b89884cc535311
parent 131a5ee9aeadb9057847a437a669dd61573f5c88
author Dianne Hackborn <hackbod@google.com> 1258764876 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258764876 -0800

am 131a5ee9: am dbf3d3ac: am af1f42be: Fix issue #2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper

Merge commit '131a5ee9aeadb9057847a437a669dd61573f5c88'

* commit '131a5ee9aeadb9057847a437a669dd61573f5c88':
  Fix issue #2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper