Merge change Ieab4c75b into eclair

* changes:
  Fix type in Java enums.  Not currently used, easier to fix now than when apps are using it.