tree 66ff9e7a5ed0e68ff76dd32a4fd8ef1792137448
parent e36ab7f5f6e27f2630d1a617341105056a6f1bfb
parent 54dffa118ca3b7439dae8431dd786073bc5fd8ce
author Michael Jurka <mikejurka@google.com> 1392411750 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411750 +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':
  Revert "Revert "Move wallpaper picker code to a separate directory""