tree d82544dae00da53cd444372e5c4e22b3469607ba
parent ff0b6e6cbd5418ad9828adb0700426ccd96bed40
parent 0cc79c66329b9ffa7d7bdfafa5d245a11fd3660d
author Mike Lockwood <lockwood@android.com> 1318521557 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1318521557 -0700

am 745e3601: am 0c265c88: Merge "MtpServer: Pass 0xFFFFFFFF for file size when receiving files >= 4GB in size" into ics-mr0

* commit '745e360103e81facb6641d035c5e3ccc8ace855e':
  MtpServer: Pass 0xFFFFFFFF for file size when receiving files >= 4GB in size