tree 280f5d8b8a7105a82e7651a2ad72b212ecb3281f
parent 140e79bb48f6639f2d58c729d6f2597bda0a51b1
parent f6502c316c602e44fd5a1706013d7123a9eb1022
author Michael Jurka <mikejurka@google.com> 1381789909 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1381789910 +0000

Merge "Don't crash if WallpaperCropActivity isn't passed a URI" into jb-ub-now-indigo-rose