summaryrefslogtreecommitdiff
path: root/libs/rs/rsScriptC.cpp
diff options
context:
space:
mode:
author Trevor Johns <trevorjohns@google.com> 2010-01-11 14:08:15 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2010-01-11 14:08:15 -0800
commit9cebb377c57f3231dbdf278678596871abcef2b8 (patch)
tree80897795e03517c0c970320d2d9c99eabd2e21b7 /libs/rs/rsScriptC.cpp
parent44641d3db3b5fd5c7616c8a646ec8b6af20baa18 (diff)
parent18dedf2cdfd2c78d93061f20c4269f00449a8e6a (diff)
am 18dedf2c: am 50a3977c: Merge "Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com." into eclair
Merge commit '18dedf2cdfd2c78d93061f20c4269f00449a8e6a' * commit '18dedf2cdfd2c78d93061f20c4269f00449a8e6a': Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com.
Diffstat (limited to 'libs/rs/rsScriptC.cpp')
0 files changed, 0 insertions, 0 deletions