Merge change I16925b91 into eclair

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