commit 196c31cf8c7fe800609966a112062c8be145976e
author Brian Carlstrom <bdc@google.com> Tue Mar 29 14:49:03 2016 -0700
committer Brian Carlstrom <bdc@google.com> Wed Mar 30 09:59:44 2016 -0700
tree 41fa3d281c52f085be6dcc0c5e1f88df74cdd044
parent 0dcb1af7d8dcdb67a5d521d2e7746f4c526a9f95

Fix typo in Conversion Functions doc

Bug: 27529815

(cherry picked from commit f166ab62f7adae7d574c12e8f7373fe3993b7205)

Change-Id: Ic21f2af16bc13009068e2ff3c376f88d3511ed4d

api/rs_convert.spec

diff --git a/api/rs_convert.spec b/api/rs_convert.spec
index c1539b5..0078bf9 100644
--- a/api/rs_convert.spec
+++ b/api/rs_convert.spec
@@ -17,7 +17,7 @@
 header:
 summary: Conversion Functions
 description:
- The functions below convert from a numerical vector type to another, of from one color
+ The functions below convert from a numerical vector type to another, or from one color
  representation to another.
 end:
 

scriptc/rs_convert.rsh

diff --git a/scriptc/rs_convert.rsh b/scriptc/rs_convert.rsh
index 9ffc183..955cf2d 100644
--- a/scriptc/rs_convert.rsh
+++ b/scriptc/rs_convert.rsh
@@ -19,7 +19,7 @@
 /*
  * rs_convert.rsh: Conversion Functions
  *
- * The functions below convert from a numerical vector type to another, of from one color
+ * The functions below convert from a numerical vector type to another, or from one color
  * representation to another.
  */