tree 0721ce8ec56cc0397e0801411fba16c0c6d81d46
parent 44dfaf263b36102c5de6b9a2ca37c6b8ed087131
parent 8e93c09ccdb1376718077f64d84be0e9f33dc0ac
author Michael Jurka <mikejurka@google.com> 1381790066 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381790066 -0700

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