tree c8717f07e36d59b120737be17609907857be12cb
parent fa071f936a0cc84b0266536a74464244744ccfe9
parent 39de459a8621abfc91382ce7b4cdd37d09aaac12
author Michael Jurka <mikejurka@google.com> 1386715705 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1386715705 +0000

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