tree bfd832d5976d60b1674a0c90c26ec67c69c7d391
parent 13d8d2d6682fbfba3262d1485c6cebf9665d751e
parent d6216b6aafbc3edb6288493d7cb36aaf2429fc19
author Michael Jurka <mikejurka@google.com> 1392411130 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411130 +0000

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 'd6216b6aafbc3edb6288493d7cb36aaf2429fc19':