tree 2ff08cf6d829bbcc1cccfadb03cb9225d1003cbc
parent fbca4b7189bf1e074aebf6e4b60919f60508df54
parent fef7773bd7b4ba8e135bef8a22f85f45e4d5e1f8
author Romain Guy <romainguy@android.com> 1258755749 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258755749 -0800

am fef7773b: am 4b14aa0d: Forgot a wallpaper.

Merge commit 'fef7773bd7b4ba8e135bef8a22f85f45e4d5e1f8' into eclair-mr2-plus-aosp

* commit 'fef7773bd7b4ba8e135bef8a22f85f45e4d5e1f8':
  Forgot a wallpaper.