summaryrefslogtreecommitdiff
path: root/libs/rs/rsScript.cpp
diff options
context:
space:
mode:
author Eric Fischer <enf@google.com> 2010-10-07 07:16:56 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-10-07 07:16:56 -0700
commit7778173a32edcfccdcc31407169d2ec40916ca2f (patch)
treee6729dadeecac973fdf590acb53e865b9b6f86b9 /libs/rs/rsScript.cpp
parent556866a2ea1f4758a79fe4f207153b71815ed400 (diff)
parent70f1a3b8a0fcf332e35f87be85ae3a9e37a85e9c (diff)
am 70f1a3b8: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit '70f1a3b8a0fcf332e35f87be85ae3a9e37a85e9c' into gingerbread-plus-aosp * commit '70f1a3b8a0fcf332e35f87be85ae3a9e37a85e9c': Import revised translations. DO NOT MERGE
Diffstat (limited to 'libs/rs/rsScript.cpp')
0 files changed, 0 insertions, 0 deletions