tree 10da860fcff71886af91d082e31f0e1917926848
parent b7aca8e735f92102edc8ffbb64955714c0d2c410
parent 8a169d492d86b731411e28561fe0a949f4766fe6
author Michael Jurka <mikejurka@google.com> 1414566080 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566080 +0000

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

* commit '8a169d492d86b731411e28561fe0a949f4766fe6':