Merge "Fix typo in Conversion Functions doc"

This commit is contained in:
Brian Carlstrom
2016-03-30 20:31:01 +00:00
committed by Gerrit Code Review
2 changed files with 2 additions and 2 deletions

View File

@@ -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>

View File

@@ -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>