commit | 326805adc3be4936a26c60be107c205f492a82e1 | [log] [tgz] |
---|---|---|
author | Mike Lockwood <lockwood@google.com> | Fri Dec 02 17:57:17 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 02 17:57:17 2011 -0800 |
tree | 27c6aed77ee974054e91426386a8daa23ca4bab6 | |
parent | 651d4c66a0abb26e32a32d40d90988e98fe7f824 [diff] | |
parent | 7570af16ad9ad892d9cff6d733d29a25d736586d [diff] |
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