diff options
| author | Vasu Nori <vnori@google.com> | 2010-09-21 12:30:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-21 12:30:12 -0700 |
| commit | bd867f681dfebeb86bc5839383fe7ca32b08a6e2 (patch) | |
| tree | 7096bb5d3c259b43b2decda2ca1ff5c875e7e898 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 065149f1628a2882a46af810ca9fc3913f7b0438 (diff) | |
| parent | b745ec954272a3c09cca354ad84e2e08b54c8544 (diff) | |
am b745ec95: (-s ours) am 173ea091: Merge "DO NOT MERGE - use appropriate names on SQL numbers in \'adb bugreport\'" into gingerbread
Merge commit 'b745ec954272a3c09cca354ad84e2e08b54c8544'
* commit 'b745ec954272a3c09cca354ad84e2e08b54c8544':
DO NOT MERGE - use appropriate names on SQL numbers in 'adb bugreport'
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions