am 432e495b: Merge change 24929 into eclair

Merge commit '432e495b239103a9688633796d940a08b27dcc05'

* commit '432e495b239103a9688633796d940a08b27dcc05':
  Port wallpaper chooser change from Launcher to Launcher2.