diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-03-03 11:46:48 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-03 11:46:48 -0800 |
| commit | 774d6ca196652bdbb72ccfde8679568f68170d57 (patch) | |
| tree | 3b1e4acba1125a82f38743d714c6b3e4cb947e00 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 72614ea2c0a2d94a1ffd23ecea796e4733b58a3e (diff) | |
| parent | 86f1c4d3ba53ea11484628081e8e49ca86e897b9 (diff) | |
am 86f1c4d3: (-s ours) am e91e5f6e: (-s ours) am c9ac3f51: Merge "DO NOT MERGE: UsbService: Make sure the USB accessory function is disabled when we disconnect" into gingerbread
* commit '86f1c4d3ba53ea11484628081e8e49ca86e897b9':
DO NOT MERGE: UsbService: Make sure the USB accessory function is disabled when we disconnect
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions