tree fdc4ebc28685009a797df8b548e7251e0383ea3b
parent 5ab7187d6eccd41680314d0a830f5cafe6fe4a3f
parent 772bbcc764a54ca513f946f70f249fd536ae84c3
author Michael Jurka <mikejurka@google.com> 1392410319 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410319 +0000

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

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