diff options
| author | Amith Yamasani <yamasani@google.com> | 2011-11-17 13:20:22 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-17 13:20:22 -0800 |
| commit | 16991b1438ced6fb6cb482bd04b03744ecf34d83 (patch) | |
| tree | c4c208917d76c0f786efd97f30f9869ec68854c2 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 66f5cf4d29cf06f241462b3cec2878b07ca23985 (diff) | |
| parent | 664bb774f528fead63d7c0e62b533da66390b246 (diff) | |
am 664bb774: am aefc0ed9: Merge "Don\'t upgrade some settings from GB to ICS." into ics-mr1
* commit '664bb774f528fead63d7c0e62b533da66390b246':
Don't upgrade some settings from GB to ICS.
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions