tree 794c59fd1614f2d1db71bfda54c047b903765b59
parent cb61d132bc8ff26b7c81fb2fa7439808014f50b3
parent b73045935cd8ec5d1a1c5e7a7ca800448b5789ea
author Brad Fitzpatrick <bradfitz@android.com> 1280281040 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280281040 -0700

am b7304593: Merge "Cap the size of StrictMode buffering we do before calling DropBox." into gingerbread

Merge commit 'b73045935cd8ec5d1a1c5e7a7ca800448b5789ea' into gingerbread-plus-aosp

* commit 'b73045935cd8ec5d1a1c5e7a7ca800448b5789ea':
  Cap the size of StrictMode buffering we do before calling DropBox.