tree 17114711b9bb443c279314c64345a29e66f8af05
parent cd79e5e173e00995f072104f7a89cf4015a90efd
parent ec1f1e3df1ca5e73e262df479bf91a92f3ccafde
author Jason Sams <rjsams@android.com> 1256869811 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1256869811 -0700

am ec1f1e3d: Merge change Ieab4c75b into eclair

Merge commit 'ec1f1e3df1ca5e73e262df479bf91a92f3ccafde' into eclair-mr2

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