am ec1f1e3d: Merge change Ieab4c75b into eclair

Merge commit 'ec1f1e3df1ca5e73e262df479bf91a92f3ccafde' into eclair-plus-aosp

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