summaryrefslogtreecommitdiff
path: root/libs/rs/rsScript.cpp
diff options
context:
space:
mode:
author Marco Nelissen <marcone@google.com> 2010-10-07 17:48:46 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-10-07 17:48:46 -0700
commiteb43f1b2eedbcfe0e8ac34452a43eaaef5dde513 (patch)
tree724368d23624341842bb3e64d1067ca4462396b5 /libs/rs/rsScript.cpp
parent54e01e0f980cfb78153d5481f7e67cef90416174 (diff)
parentef5afa073b4a8c80ac5f28ccc02e1d0b42b1560f (diff)
am ef5afa07: (-s ours) Do not merge. Don\'t crash when extra logging is enabled.
Merge commit 'ef5afa073b4a8c80ac5f28ccc02e1d0b42b1560f' into gingerbread * commit 'ef5afa073b4a8c80ac5f28ccc02e1d0b42b1560f': Do not merge.
Diffstat (limited to 'libs/rs/rsScript.cpp')
0 files changed, 0 insertions, 0 deletions