tree c2ebc41ea569b34761d00f1acea4a5de23b34bfa
parent 201d641a185d9b202839ff73d85c81e5f0ebc0ae
parent bfa5d5bade1e1a6eb41c8425bb3562caa7ad1161
author Winson Chung <winsonc@google.com> 1337635956 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337635956 -0700

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

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