tree c2ebc41ea569b34761d00f1acea4a5de23b34bfa
parent 2916480f06f23b2b29deeb0c3c78dbb161a4ee49
parent fe0e16afe9902c6f5f60ce0d5dcdbcc10290849f
author Winson Chung <winsonc@google.com> 1337632780 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337632780 -0700

am fe0e16af: Merge "Updating wallpapers (except for xlarge devices). (Bug 6460469)" into jb-dev

* commit 'fe0e16afe9902c6f5f60ce0d5dcdbcc10290849f':
  Updating wallpapers (except for xlarge devices). (Bug 6460469)