OSDN Git Service

am 986174aa: Merge change I6d3d5b7e into eclair-mr2
authorLeon Scroggins <scroggo@google.com>
Fri, 9 Oct 2009 19:22:34 +0000 (12:22 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 9 Oct 2009 19:22:34 +0000 (12:22 -0700)
Merge commit '986174aacfe289956975d731b87a7f99a19ce0b0' into eclair-mr2-plus-aosp

* commit '986174aacfe289956975d731b87a7f99a19ce0b0':
  File upload.


Trivial merge