tree cba62d0d64153aa2169651696bc238591341d679
parent 1e88c3b868e6a508420cc0a63d3558c34c87360c
parent fe49b8959798478bed7d09fe8349de5d56ecb52e
author Michael Jurka <mikejurka@google.com> 1414085308 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085308 +0000

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 'fe49b8959798478bed7d09fe8349de5d56ecb52e':