am 986174aa: Merge change I6d3d5b7e into eclair-mr2

Merge commit '986174aacfe289956975d731b87a7f99a19ce0b0' into eclair-mr2-plus-aosp

* commit '986174aacfe289956975d731b87a7f99a19ce0b0':
  File upload.