tree cba62d0d64153aa2169651696bc238591341d679
parent 7f110bd5ccfae8ded3c5c1468c2284717189035d
parent 25acac7c4469000a3f53f74b92c0b1575ecf7da2
author Michael Jurka <mikejurka@google.com> 1414085467 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085467 +0000

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

* commit '25acac7c4469000a3f53f74b92c0b1575ecf7da2':