tree a331dffad396b9bf173ad229987a2f30be4f488e
parent e6e9abecfe42b2ad965c9c9b923a0f9d61b71957
parent 4a8938fd16740bf7833b446abe05d0d994f166e2
author Winson Chung <winsonc@google.com> 1336345899 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336345899 -0700

am 4a8938fd: Merge "Keying off the Launcher state to determine wallpaper visibility (Bug 6396752)" into jb-dev

* commit '4a8938fd16740bf7833b446abe05d0d994f166e2':
  Keying off the Launcher state to determine wallpaper visibility (Bug 6396752)