am 9e91b7d5: Merge "Don\'t crash if WallpaperCropActivity isn\'t passed a URI"...
am 9e91b7d5: Merge "Don\'t crash if WallpaperCropActivity isn\'t passed a URI" into jb-ub-now-indigo-rose
* commit '9e91b7d5':
Don't crash if WallpaperCropActivity isn't passed a URI