tree 10da860fcff71886af91d082e31f0e1917926848
parent e4374420512351bd2eaf6e186129e82fe337eefb
parent 5c100832506219e40ff246963587dbed8029d0bb
author Michael Jurka <mikejurka@google.com> 1414566347 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566347 +0000

am 5c100832: am 25acac7c: am aa07fd63: am 6f372bb7: am 5fa148a1: am 5bfab60f: Fix NPE in Live Wallpaper loader

* commit '5c100832506219e40ff246963587dbed8029d0bb':