tree e5451e4cc8c5ad921ab13342359cdca49838ea66
parent 465606c29c9d512f2e473ecba35fbd1accda5c58
parent 0a667dd4efa69e0f817e8a126df23c1e1f9aab6f
author Michael Jurka <mikejurka@google.com> 1392411271 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411271 +0000

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

* commit '0a667dd4efa69e0f817e8a126df23c1e1f9aab6f':
  Revert "Move wallpaper picker code to a separate directory"