diff options
author | James Dong <jdong@google.com> | 2010-07-15 11:54:10 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-15 11:54:10 -0700 |
commit | 892681e56ee6da6e8d4fb9ec41e75e814ae9e099 (patch) | |
tree | ba88dfd4766ae1063d814797c7d691427651a1e3 /graphics/java/android/renderscript/ProgramRaster.java | |
parent | dcd077179c853e54498e9127526a8f2984c0dda0 (diff) | |
parent | b068b47c6d0214256116a0c661740bddf7acc18c (diff) |
am b068b47c: am d6a85a21: Merge "Support user-supplied timescales for authoring" into gingerbread
Merge commit 'b068b47c6d0214256116a0c661740bddf7acc18c'
* commit 'b068b47c6d0214256116a0c661740bddf7acc18c':
Support user-supplied timescales for authoring
Diffstat (limited to 'graphics/java/android/renderscript/ProgramRaster.java')
0 files changed, 0 insertions, 0 deletions