Merge change I0c33d697 into eclair-mr2

* changes:
  Clean old DropBoxService.java generated class