diff options
| author | Mike Lockwood <lockwood@google.com> | 2011-12-02 17:57:17 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-02 17:57:17 -0800 |
| commit | ec61b5cb12dabb2ce22193ce698189bebd9dc516 (patch) | |
| tree | 5e7b7cc2b536b56d3ca678bece14ed5116160a70 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3dd71147db575fc7d1d95047dceb59a8d275e62a (diff) | |
| parent | 7bbc3c4bbe9e542abba2ad30072efb1b25fd9ea2 (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
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions