tree edd584557c5c2066c1164e90f5471b7e1be07d2d
parent 268ca730ddabef30e9831bad401c6b58bf20f46a
parent 03337715b7c95cdd23e897acc176818cacd5229e
author Michael Jurka <mikejurka@google.com> 1380218773 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380218773 -0700

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

* commit '03337715b7c95cdd23e897acc176818cacd5229e':
  Add default wallpaper to picker