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

* commit '8e93c09ccdb1376718077f64d84be0e9f33dc0ac':
  Don't crash if WallpaperCropActivity isn't passed a URI