diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-03-03 11:42:05 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-03 11:42:05 -0800 |
| commit | 86f1c4d3ba53ea11484628081e8e49ca86e897b9 (patch) | |
| tree | a1db99bf298baa3f324128517e6ad04443db4f26 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6c8d76527c938eb49182a6fd0677ccbc1618e7a8 (diff) | |
| parent | e91e5f6e9db4db5cd53836c901a7f80c11abb55c (diff) | |
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 'e91e5f6e9db4db5cd53836c901a7f80c11abb55c':
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