tree 0358aa3e48c7996d6ce6f8f96fbd518158dca74e
parent 269acfe37ac0f5b69c79ecb3a76a814387d8dfd3
parent 37b91eb10daeed68d12dff80fd1814158b103520
author Romain Guy <romainguy@android.com> 1258096671 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258096671 -0800

am 37b91eb1: am 0faf71a1: Merge change Ieb9892d5 into eclair

Merge commit '37b91eb10daeed68d12dff80fd1814158b103520' into eclair-mr2-plus-aosp

* commit '37b91eb10daeed68d12dff80fd1814158b103520':
  Two wallpapers were missing from the list.