diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-04-04 17:44:46 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-04 17:44:46 -0700 |
| commit | 824c6edce8f79aac9c98caabd9b8857d4c580629 (patch) | |
| tree | 2677f944abbab44278fab5b0242226f0fbc9bb79 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | fa6b78890b17f6df2175b143783174ab5e7f7758 (diff) | |
| parent | 179122ad56f12bd802fd29fe0b6606dd23ec5ba9 (diff) | |
am 179122ad: (-s ours) am a8731e1e: Merge "DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust" into gingerbread
* commit '179122ad56f12bd802fd29fe0b6606dd23ec5ba9':
DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions