tree c71af13eddc9901067f8e6cf2d80174534e4f578
parent d2a59930d8958f58a96409fc8efe68a53b976ed8
parent d9001a7dc5854d5dfc24a5ead19ad8c05acf171e
author Jean-Baptiste Queru <jbq@google.com> 1344986180 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1344986180 -0700

am d9001a7d: Merge "NPE in WallpaperHandler"

* commit 'd9001a7dc5854d5dfc24a5ead19ad8c05acf171e':
  NPE in WallpaperHandler