tree b06a42e81d3736230ac7ff49f114b3085a2d0645
parent 98245209f6d97d4f74bfe55cd2ff7e0756ed120b
parent 8824eadc960a90fe5f1dddb231e430c782d960d0
author Michael Jurka <mikejurka@google.com> 1392410316 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410316 +0000

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

* commit '8824eadc960a90fe5f1dddb231e430c782d960d0':
  Revert "Move wallpaper picker code to a separate directory"