tree e5451e4cc8c5ad921ab13342359cdca49838ea66
parent 429b4273a36553fa98d83aca2743d1bce09b40f6
parent 8e47355a8fcf5e4c93397b7404e0e2f6dd63c5ab
author Michael Jurka <mikejurka@google.com> 1392411748 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411748 +0000

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

* commit '8e47355a8fcf5e4c93397b7404e0e2f6dd63c5ab':
  Revert "Move wallpaper picker code to a separate directory"