tree b007228f690df1ca77e9fb4a86e361f774c770ee
parent 58a7e315c27ef36d8104f6bfb09569ad81ec0cf5
parent 31d3e8ae425bf6cafc8baf10c61b523e37392179
author Romain Guy <romainguy@android.com> 1258756067 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258756067 -0800

am 31d3e8ae: am fef7773b: am 4b14aa0d: Forgot a wallpaper.

Merge commit '31d3e8ae425bf6cafc8baf10c61b523e37392179'

* commit '31d3e8ae425bf6cafc8baf10c61b523e37392179':
  Forgot a wallpaper.