diff options
| author | Vasu Nori <vnori@google.com> | 2010-09-21 12:25:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-21 12:25:39 -0700 |
| commit | b745ec954272a3c09cca354ad84e2e08b54c8544 (patch) | |
| tree | 23b1d6ccf56f40e7a302f127588ac67197d031c8 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 100cc263b465242c01dc9eb280d77ffaadbddd39 (diff) | |
| parent | 173ea0912af296c6e80d14b764046534b316d21f (diff) | |
am 173ea091: Merge "DO NOT MERGE - use appropriate names on SQL numbers in \'adb bugreport\'" into gingerbread
Merge commit '173ea0912af296c6e80d14b764046534b316d21f' into gingerbread-plus-aosp
* commit '173ea0912af296c6e80d14b764046534b316d21f':
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