Merge change If2b0bbed into eclair

* changes:
  Debugging for issue #2228381 android.view.InflateException
tree: 94abd3782281591f48e93c5f8a27db8128b5f132
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE