tree 9373f5e8f4d871d07ace10bb7082167b685d0bb6
parent b040fcf52b4ccf6896e62a315abc447ea52db107
parent 6f372bb723a87bb6c292067a848e1c4aa8153107
author Michael Jurka <mikejurka@google.com> 1392410264 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410264 +0000

am 6f372bb7: am 5fa148a1: am 5bfab60f: Fix NPE in Live Wallpaper loader

* commit '6f372bb723a87bb6c292067a848e1c4aa8153107':
  Fix NPE in Live Wallpaper loader