tree 2ff08cf6d829bbcc1cccfadb03cb9225d1003cbc
parent cb878268233ddd71011645bbbf03614f43855356
parent 4b14aa0d8a91fe074833c8f709d42b870d920316
author Romain Guy <romainguy@android.com> 1258755537 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258755537 -0800

am 4b14aa0d: Forgot a wallpaper.

Merge commit '4b14aa0d8a91fe074833c8f709d42b870d920316' into eclair-mr2

* commit '4b14aa0d8a91fe074833c8f709d42b870d920316':
  Forgot a wallpaper.