tree 66ff9e7a5ed0e68ff76dd32a4fd8ef1792137448
parent 5aff893a2366b274e81c1c23e0c2fb266f080873
parent d2f157283c599e49083a89b5c78c64a9258fbe1a
author Michael Jurka <mikejurka@google.com> 1392411273 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411273 +0000

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

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