summaryrefslogtreecommitdiff
path: root/libs/rs/rsScriptC.cpp
diff options
context:
space:
mode:
author Xavier Ducrohet <xav@android.com> 2011-04-11 17:28:59 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-04-11 17:28:59 -0700
commitda64f6cf3ce9652dcb1ad7e14e17dd2dbe2c7bd7 (patch)
tree6a4b1d2f4e4e64f447db97b3964d8269d03bd31a /libs/rs/rsScriptC.cpp
parent4a1ba21044bfb0a684a4ea3a559e427f2e092e1c (diff)
parent1f2a307b59a6f1d61390425b52c3f0aafc21c54b (diff)
am 1f2a307b: resolved conflicts for merge of 4754c79a to honeycomb-plus-aosp
* commit '1f2a307b59a6f1d61390425b52c3f0aafc21c54b': LayoutLib: don't render when shader's local matrix is set to 0 scale.
Diffstat (limited to 'libs/rs/rsScriptC.cpp')
0 files changed, 0 insertions, 0 deletions