tree cba62d0d64153aa2169651696bc238591341d679
parent cb3d4a61f2af40e7fa8d143b4e2bc4889ca40711
parent 8e47355a8fcf5e4c93397b7404e0e2f6dd63c5ab
author Michael Jurka <mikejurka@google.com> 1414085536 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085536 +0000

am 8e47355a: am 0a667dd4: am 8824eadc: Merge "Revert "Move wallpaper picker code to a separate directory"" into jb-ub-now-kermit

* commit '8e47355a8fcf5e4c93397b7404e0e2f6dd63c5ab':