am eac70503: am 5c8a80b8: Merge change I4410ec8f into eclair-mr2

Merge commit 'eac70503c27104117f42de405cd5bd73579096be'

* commit 'eac70503c27104117f42de405cd5bd73579096be':
  Framework-side DropBox service that maintains a size-bounded