tree cba62d0d64153aa2169651696bc238591341d679
parent a0fa07a05fcb0ba4914a376abb717fabed3c80b8
parent 54dffa118ca3b7439dae8431dd786073bc5fd8ce
author Michael Jurka <mikejurka@google.com> 1414085538 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085538 +0000

am 54dffa11: am d2f15728: am 772bbcc7: Merge "Revert "Revert "Move wallpaper picker code to a separate directory""" into jb-ub-now-kermit

* commit '54dffa118ca3b7439dae8431dd786073bc5fd8ce':