From 5278d00d1974534c9ce73c0c8d23a2a99edfb524 Mon Sep 17 00:00:00 2001
From: Brian Carlstrom <bdc@google.com>
Date: Tue, 29 Mar 2016 14:49:09 -0700
Subject: [PATCH] Fix typo in Conversion Functions doc

Bug: 27529815

(cherry picked from commit b61a0dae0923f17089a894ea959a87a91cd12f9f)

Change-Id: I401531a469f8ea01175d738e1cb4a02a064c9194
---
 docs/html/guide/topics/renderscript/reference/overview.jd   | 2 +-
 docs/html/guide/topics/renderscript/reference/rs_convert.jd | 2 +-
 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 5e824ee2b7e51..017a7134228a0 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 d4bf77faf5a35..89fd040c26a1d 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>