tree edd584557c5c2066c1164e90f5471b7e1be07d2d
parent c7bceb064cf14bfd0b800fc0a5d713b2f46bea08
parent 1b495f5298d4648adab0b24dca7a3bc5267bf710
author Michael Jurka <mikejurka@google.com> 1380218433 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380218433 -0700

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

* commit '1b495f5298d4648adab0b24dca7a3bc5267bf710':
  Add default wallpaper to picker