tree 205a61976513893840cf029511e4bf99dc8162e8
parent 584eee2035b4004d458ede622d33f7ea66698b59
parent bbc140b545ffd6c230269af3b0b5cad98838fc3a
author Sunny Goyal <sunnygoyal@google.com> 1429142342 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429142342 +0000

am bbc140b5: Merge "Revert "Revert "Disable setWallpaper button until the wallpaper is loaded" Will submit again after the drop" Actual fix" into ub-launcher3-burnaby

* commit 'bbc140b545ffd6c230269af3b0b5cad98838fc3a':
  Revert "Revert "Disable setWallpaper button until the wallpaper is loaded" Will submit again after the drop" Actual fix