am c804efe2: Merge change 23569 into donut

Merge commit 'c804efe278fa33555e6e836504a467cb14505eb3' into eclair

* commit 'c804efe278fa33555e6e836504a467cb14505eb3':
  Update 4.xml to the most recent APIs.
tree: f47c585c457a7fed85f6a9d83c8d2b5de35ee9f1
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE