OSDN Git Service

am 7bbc3c4b: (-s ours) am 7f87d9cf: Merge "MTP: Don\'t attempt to read more than...
authorMike Lockwood <lockwood@google.com>
Sat, 3 Dec 2011 01:57:17 +0000 (17:57 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 3 Dec 2011 01:57:17 +0000 (17:57 -0800)
commit326805adc3be4936a26c60be107c205f492a82e1
tree27c6aed77ee974054e91426386a8daa23ca4bab6
parent651d4c66a0abb26e32a32d40d90988e98fe7f824
parent7570af16ad9ad892d9cff6d733d29a25d736586d
am 7bbc3c4b: (-s ours) am 7f87d9cf: Merge "MTP: Don\'t attempt to read more than 16K at a time from the MTP driver DO NOT MERGE" into ics-mr1

* commit '7bbc3c4bbe9e542abba2ad30072efb1b25fd9ea2':
  MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT MERGE