am e4133ec1: am ec1f1e3d: Merge change Ieab4c75b into eclair

Merge commit 'e4133ec1296f23142eabf7783db417ecc8f1bb05' into eclair-mr2-plus-aosp

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