tree b610d2a1e50b42e85fa48f3f1412dbf56e701ced
parent f84493ec95bfce41106673645a3e56b185e54df5
parent 809c369892ddbae908dc47e6a1032a768e9004cb
author Michael Wright <michaelwr@android.com> 1398885065 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398885065 +0000

am 809c3698: am 54c3529b: Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent"

* commit '809c369892ddbae908dc47e6a1032a768e9004cb':
  WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent