summaryrefslogtreecommitdiff
path: root/libs/rs/RenderScript.cpp
diff options
context:
space:
mode:
author Justin Ho <justinho@google.com> 2012-03-20 19:35:47 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2012-03-20 19:35:47 -0700
commit565cfb3c30a6e5835a7e083138a7086851623a83 (patch)
tree3716841bd158348a0fa10569e275ce93a46de032 /libs/rs/RenderScript.cpp
parent48592a0babcf4371152d84fda9b7bd69722dc8b0 (diff)
parent68f4ffb4358842482e8b86b2afbbce4a4ed6135e (diff)
am 68f4ffb4: (-s ours) am 47ec443a: am 972d12aa: Merge "DO NOT MERGE Revert "Increase line limit for summary text"" into ics-mr1
* commit '68f4ffb4358842482e8b86b2afbbce4a4ed6135e':
Diffstat (limited to 'libs/rs/RenderScript.cpp')
0 files changed, 0 insertions, 0 deletions