am 704af39c: am 638d8653: Merge change I47ef4266 into eclair

Merge commit '704af39c283060047441771e242d89fb3296bffb' into eclair-mr2-plus-aosp

* commit '704af39c283060047441771e242d89fb3296bffb':
  Expose WallpaperSettingsActivity in the public API.