am 0dffdc7e: Merge change Iead6e21b into eclair

Merge commit '0dffdc7ea90919e1c449f5832e952a5ab140ddf8' into eclair-mr2

* commit '0dffdc7ea90919e1c449f5832e952a5ab140ddf8':
  Clean up live wallpaper picker list.
tree: 05a5cbc94fcfe5c7d91a0a92f58becab77244211
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE