tree cba62d0d64153aa2169651696bc238591341d679
parent 806bb8de02428e53992880be77ebae7ac4a01ec3
parent 0d7ed5fc5f524e966dcc9060ea7b4eff0e57469c
author Michael Jurka <mikejurka@google.com> 1414085544 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085544 +0000

am 0d7ed5fc: am fb07a6ab: am 69413c91: Move additional wallpaper picker files to special dir

* commit '0d7ed5fc5f524e966dcc9060ea7b4eff0e57469c':