tree 5ed7fe3841930abafa1b45c50f5347c2d1011a00
parent 71bc71fb7e9a87717f67a2619a3a47f8de07f3e1
parent 4f462f4a8b9fc6897d9fab9ad31c06e0b8f79373
author Jorim Jaggi <jjaggi@google.com> 1393599356 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1393599356 -0800

am 4f462f4a: Merge "Revert "Disabled the wallpaper when completely in -1 Now space."" into ub-now-lunchbox

* commit '4f462f4a8b9fc6897d9fab9ad31c06e0b8f79373':
  Revert "Disabled the wallpaper when completely in -1 Now space."