tree 10da860fcff71886af91d082e31f0e1917926848
parent 11bcfaa1644ff9895e82c0e7272d7749079254b2
parent e74f0905d4a7de2aa278a7ae3ad5d68eaa8eb6b1
author Michael Jurka <mikejurka@google.com> 1414566425 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566425 +0000

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

* commit 'e74f0905d4a7de2aa278a7ae3ad5d68eaa8eb6b1':