Merge change I3fbd0a2f into eclair-mr2

* changes:
  Generate a calendar static Java library.