tree 10da860fcff71886af91d082e31f0e1917926848
parent 616077d9fc19bec99549b0168011ed491cdf1a96
parent 426e728d064fd08065a4acedd8b55ed7df89bb7c
author Michael Jurka <mikejurka@google.com> 1414566275 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566275 +0000

am 426e728d: am 81d24da1: am d6216b6a: am 16b194f8: am 8e93c09c: am 9e91b7d5: Merge "Don\'t crash if WallpaperCropActivity isn\'t passed a URI" into jb-ub-now-indigo-rose

* commit '426e728d064fd08065a4acedd8b55ed7df89bb7c':