tree 5fa5d70d2e8a935c80cde1a368661dd807e4ba03
parent 682440b224eaaa508ba7760ade4de9bf2d1ff528
parent b2a275ecd2a5c02f2c4b51f5142e0d253746e534
author Winson Chung <winsonc@google.com> 1336514493 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336514493 -0700

am b2a275ec: Merge "Consistently re-enabling the wallpaper when we leave launcher. (Bug 6445085)" into jb-dev

* commit 'b2a275ecd2a5c02f2c4b51f5142e0d253746e534':
  Consistently re-enabling the wallpaper when we leave launcher. (Bug 6445085)