tree 972b9b403bf98dfc47a6dacb533d1e0738da397d
parent 8f3321bdab2d0e1a3fd09e91d324477d0f338091
parent 391f1a8062a17ec0865128a910e6d90049c352d5
author Michael Jurka <mikejurka@google.com> 1390483489 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1390483489 -0800

am 391f1a80: Merge "Disable Set Wallpaper button while loading image" into ub-now-lunchbox

* commit '391f1a8062a17ec0865128a910e6d90049c352d5':
  Disable Set Wallpaper button while loading image