tree c433a28275a0ae1bdf1bdf7e2795cce61e7ad92a
parent 7164e883689ec91469e2a8a55fdf7e671e628f3d
parent 6ea9add679cc0de8c6b132e9d0bffba75b1d4d47
author Michael Jurka <mikejurka@google.com> 1381348944 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381348944 -0700

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

* commit '6ea9add679cc0de8c6b132e9d0bffba75b1d4d47':
  Fix crash when pick an image for wallpaper