tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent e575a74e54c58527e4372aa5a848e9094a27a55f
parent 39abdd2277d882797af28c145a05e976a657d977
author Michael Jurka <mikejurka@google.com> 1392411498 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411498 +0000

am 39abdd22: am d6ff815f: am 216a9b17: am 03337715: am 1b495f52: Merge "Add default wallpaper to picker" into jb-ub-now-indigo-rose

* commit '39abdd2277d882797af28c145a05e976a657d977':