tree cba62d0d64153aa2169651696bc238591341d679
parent 392181be3c97487ec37317eac2cd0c60f133f07e
parent 39abdd2277d882797af28c145a05e976a657d977
author Michael Jurka <mikejurka@google.com> 1414085138 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085138 +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':