tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent 126e7a5fe9e9cd3acfdbf9d680f37b7fa991cebd
parent 216a9b17f11dd781b70917e289cae1b3e13958ae
author Michael Jurka <mikejurka@google.com> 1392410111 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410111 +0000

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

* commit '216a9b17f11dd781b70917e289cae1b3e13958ae':