tree 10da860fcff71886af91d082e31f0e1917926848
parent 10fa6085a33b676e9dfc514ec5461fdf71b104fe
parent 688e94eeff7512021eefd2db3161b2615df278c3
author Michael Jurka <mikejurka@google.com> 1414566234 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566234 +0000

am 688e94ee: am fe49b895: am f36857e8: am e623e001: am 6ea9add6: am e81400c8: Merge "Fix crash when pick an image for wallpaper" into jb-ub-now-indigo-rose

* commit '688e94eeff7512021eefd2db3161b2615df278c3':