tree c07e9cb2a55b5638efa12497db9430751f579883
parent feec09d731782ca2e8b0fe9d59192fbc43f56e6c
parent 8657bac9b55a8db9ce587ea896a03325968498ea
author Christoph Studer <chstuder@google.com> 1393862664 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1393862664 -0800

am 8657bac9: Merge "Guard against null default wallpaper" into ub-now-lunchbox

* commit '8657bac9b55a8db9ce587ea896a03325968498ea':
  Guard against null default wallpaper