tree 5f5690714dbec2a3cccbcebd68f82b5b396692c1
parent a40916d534da1b3e05c905b5beb931e0140a353f
parent 96749c13218aa1b783709dc82a4e16657ce9753f
author Michael Jurka <mikejurka@google.com> 1386775098 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1386775099 +0000

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