tree 8705c4ccf2b4b93a1a3ded1c38c6c09a540540f8
parent a6a5c8f6b66c0750a28d2ad9cba18d0c730c4393
parent c28fde57f0c7762913615b16d651d4e7991d6175
author Amith Yamasani <yamasani@google.com> 1359398035 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1359398035 -0800

am c28fde57: am 0b515aec: am 3cfca67b: Merge "Fix possible integer overflow in MtpStorage"

# By Henrik Engström
# Via Android Git Automerger (2) and others
* commit 'c28fde57f0c7762913615b16d651d4e7991d6175':
  Fix possible integer overflow in MtpStorage