summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Brian Carlstrom <bdc@google.com> 2016-03-29 14:49:09 -0700
committer Brian Carlstrom <bdc@google.com> 2016-03-29 14:49:09 -0700
commitb61a0dae0923f17089a894ea959a87a91cd12f9f (patch)
tree190f908ecf155a34ea37049b9bed22b1c154aef1
parentbdda585f862bd2880c98dabe1a981f9559d29662 (diff)
Fix typo in Conversion Functions doc
Bug: 27529815 Change-Id: I470348a232d9955d23463ec32c2de60abb44bc3f
-rw-r--r--docs/html/guide/topics/renderscript/reference/overview.jd2
-rw-r--r--docs/html/guide/topics/renderscript/reference/rs_convert.jd2
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/html/guide/topics/renderscript/reference/overview.jd b/docs/html/guide/topics/renderscript/reference/overview.jd
index 5e824ee2b7e5..017a7134228a 100644
--- a/docs/html/guide/topics/renderscript/reference/overview.jd
+++ b/docs/html/guide/topics/renderscript/reference/overview.jd
@@ -611,7 +611,7 @@ elements, and scripts. Most of these object are created using the Java RenderSc
</tr>
</tbody></table>
<h2>Conversion Functions</h2>
-<p> The functions below convert from a numerical vector type to another, of from one color
+<p> The functions below convert from a numerical vector type to another, or from one color
representation to another.
</p>
<table class='jd-sumtable'><tbody>
diff --git a/docs/html/guide/topics/renderscript/reference/rs_convert.jd b/docs/html/guide/topics/renderscript/reference/rs_convert.jd
index d4bf77faf5a3..89fd040c26a1 100644
--- a/docs/html/guide/topics/renderscript/reference/rs_convert.jd
+++ b/docs/html/guide/topics/renderscript/reference/rs_convert.jd
@@ -4,7 +4,7 @@ page.title=RenderScript Conversion Functions
<div class='renderscript'>
<h2>Overview</h2>
-<p> The functions below convert from a numerical vector type to another, of from one color
+<p> The functions below convert from a numerical vector type to another, or from one color
representation to another.
</p>
<h2>Summary</h2>