Merge commit '5c8a80b8fc7a25dda269cd16e0b90b35227fd625' into eclair-mr2-plus-aosp * commit '5c8a80b8fc7a25dda269cd16e0b90b35227fd625': Framework-side DropBox service that maintains a size-bounded
Merge commit '5c8a80b8fc7a25dda269cd16e0b90b35227fd625' into eclair-mr2-plus-aosp * commit '5c8a80b8fc7a25dda269cd16e0b90b35227fd625': Framework-side DropBox service that maintains a size-bounded