tree e4b908951062447b2e4db99520ae3d2acc9951e5
parent 18238d90aec90e4f9e5aebc68133d31b4639b52c
parent 5bfab60fff6c3da8f8d8e245a496a031f807560d
author Michael Jurka <mikejurka@google.com> 1383927444 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383927444 -0800

am 5bfab60f: Fix NPE in Live Wallpaper loader

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