am aaa8e7e6: am 27d6e65b: Merge change I322b6ee7 into eclair

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

* commit 'aaa8e7e633b61b221d10f21006bf2cd197004093':
  Add support for making a LiveWallpaper the default