tree 2a9e8af77f86b134373836526bd18a88d1176f99
parent ed426b0adb81ec828bed53c981f03e12f9bdfafd
parent 25acac7c4469000a3f53f74b92c0b1575ecf7da2
author Michael Jurka <mikejurka@google.com> 1392411683 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411683 +0000

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

* commit '25acac7c4469000a3f53f74b92c0b1575ecf7da2':
  Fix NPE in Live Wallpaper loader