tree b46295c70045ce3a1a2428756ce4e49d8e36fa0f
parent 98a89d86934fbc4e949c904733d1571ec9d6c8f3
parent b3c5fac5dc16189f1d9ebe7ff8504612d4869e6f
author Sunny Goyal <sunnygoyal@google.com> 1429141669 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429141669 +0000

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

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