tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent f7b042cb3a71a380312809f77080e45c3ee4988f
parent f36857e8b9d7d315d486e1ab1cd864c9be468622
author Michael Jurka <mikejurka@google.com> 1392411095 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411095 +0000

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

* commit 'f36857e8b9d7d315d486e1ab1cd864c9be468622':