summaryrefslogtreecommitdiff
path: root/libs/rs/rsScriptC.cpp
diff options
context:
space:
mode:
author The Android Open Source Project <initial-contribution@android.com> 2010-05-14 13:54:56 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-05-14 13:54:56 -0700
commit12b6f6eaee7e92b80d04eb3b6387a08454007b8d (patch)
tree488614969774764bf493787aec65b91cd0153967 /libs/rs/rsScriptC.cpp
parentad8ce5346a3c5ac6d29246373bf129f9d6567d9f (diff)
parent55b7d1243f15395a102971e8fdc57444638729ac (diff)
am 55b7d124: merge from open-source master
Merge commit '55b7d1243f15395a102971e8fdc57444638729ac' into kraken * commit '55b7d1243f15395a102971e8fdc57444638729ac': SetLocaleByCarrier, only if its not an unknown carrier.
Diffstat (limited to 'libs/rs/rsScriptC.cpp')
0 files changed, 0 insertions, 0 deletions