tree 10da860fcff71886af91d082e31f0e1917926848
parent 3c44a9209f726934cd54e64ade3bba7bb7dd94b9
parent 1ebef2df9bb0331e16a1b29dd010e654657e95aa
author Michael Jurka <mikejurka@google.com> 1414566420 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566420 +0000

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

* commit '1ebef2df9bb0331e16a1b29dd010e654657e95aa':