tree 0358aa3e48c7996d6ce6f8f96fbd518158dca74e
parent 8d57867445507f4a104dc67cc44dad0930763967
parent 0faf71a13c472de89eced953fc95d2ced0149e75
author Romain Guy <romainguy@android.com> 1258064968 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258064968 -0800

am 0faf71a1: Merge change Ieb9892d5 into eclair

Merge commit '0faf71a13c472de89eced953fc95d2ced0149e75' into eclair-mr2

* commit '0faf71a13c472de89eced953fc95d2ced0149e75':
  Two wallpapers were missing from the list.