tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent 76d5e31fe5c4e9640ae81d45b54ea11736d8fe46
parent e623e00199cf38786780ce18395b7366c1ff0948
author Michael Jurka <mikejurka@google.com> 1392410189 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410189 +0000

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

* commit 'e623e00199cf38786780ce18395b7366c1ff0948':