tree 7d17a634ea7174488a2386cef00c0e60d36da904
parent c270b8d9fdf870327d3d3b34be219a55cfb22270
parent 16b194f8cd58048f571b190dc380a2d7398f0acd
author Michael Jurka <mikejurka@google.com> 1392410214 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410214 +0000

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

* commit '16b194f8cd58048f571b190dc380a2d7398f0acd':