tree 0721ce8ec56cc0397e0801411fba16c0c6d81d46
parent 6eabacd4999a543f8625027e9d223335ad56eb84
parent 9e91b7d5fccebc454424657e62497016ebdc7d1e
author Michael Jurka <mikejurka@google.com> 1381790009 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381790009 -0700

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

* commit '9e91b7d5fccebc454424657e62497016ebdc7d1e':
  Don't crash if WallpaperCropActivity isn't passed a URI