tree 141c553740922aaed5f3a375f16cb71c5962d062
parent a05060c987529a7443d66d5117408a120beec411
parent 5fa148a1d9204a3de3177aef18c80506de2879e8
author Michael Jurka <mikejurka@google.com> 1383927597 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383927597 -0800

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

* commit '5fa148a1d9204a3de3177aef18c80506de2879e8':
  Fix NPE in Live Wallpaper loader