Merge change Ieab4c75b into eclair

* changes:
  Fix type in Java enums.  Not currently used, easier to fix now than when apps are using it.
tree: 6e5cc79434d23a456184af9067260bc15df05c37
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE