From: Michael Jurka <mikejurka@google.com>
Date: Mon, 14 Oct 2013 22:33:29 +0000 (-0700)
Subject: am 9e91b7d5: Merge "Don\'t crash if WallpaperCropActivity isn\'t passed a URI" into... 
X-Git-Tag: android-x86-6.0-r1~634^2~112
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8e93c09ccdb1376718077f64d84be0e9f33dc0ac;p=android-x86%2Fpackages-apps-Launcher3.git

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
---

8e93c09ccdb1376718077f64d84be0e9f33dc0ac