tree cba62d0d64153aa2169651696bc238591341d679
parent 9a07e0e61a42d9d609e3bb37b156494ecf0c73b9
parent 81d24da13ba8bb7c9f9b852f5f5d96b75924d8ba
author Michael Jurka <mikejurka@google.com> 1414085349 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085349 +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':