tree c07e9cb2a55b5638efa12497db9430751f579883
parent fa81e73ea27e894b38886804249b8b1cdca73caf
parent db6f304d6bc6a93a30b7b6f7ae4339f719c84797
author Christoph Studer <chstuder@google.com> 1393862823 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1393862823 +0000

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

* commit 'db6f304d6bc6a93a30b7b6f7ae4339f719c84797':
  Guard against null default wallpaper