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.
tree: a686c4d9a0b3c581a5cda314cd6f782cea2b3284
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE