tree c433a28275a0ae1bdf1bdf7e2795cce61e7ad92a
parent 0225a4a13804139c79e09804e84038fb5a76aafb
parent e81400c8b720acd566dd5f7a7081f57dbf7502c5
author Michael Jurka <mikejurka@google.com> 1381348702 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381348702 -0700

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

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