am 311bb7fc: Merge change I0c8814d1 into eclair

Merge commit '311bb7fcc145115675adc7e5f1567dce479d4899' into eclair-plus-aosp

* commit '311bb7fcc145115675adc7e5f1567dce479d4899':
  Removing copyrighted backgrounds/logos from ContactManager and Wiktionary
tree: 7d5330152c49ca35fd3948d913acff0edebb6230
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE