tree bfd832d5976d60b1674a0c90c26ec67c69c7d391
parent cf5be0342fe0041c9d508d8febf9fe251d2c6024
parent 81d24da13ba8bb7c9f9b852f5f5d96b75924d8ba
author Michael Jurka <mikejurka@google.com> 1392411598 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411598 +0000

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 '81d24da13ba8bb7c9f9b852f5f5d96b75924d8ba':