summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ScriptIntrinsic.java
diff options
context:
space:
mode:
authorTodd Kopriva <kopriva@google.com>2018-03-23 21:48:55 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-03-23 21:48:55 +0000
commit5b0a4eea8dd4c36d4501d053869fce1cd8a8ee82 (patch)
tree9b15ec07d6d3de4230652ecef0b4c1284e434a8b /rs/java/android/renderscript/ScriptIntrinsic.java
parent60b06bd217a92279c89ae2743285c7e3cfaeb5af (diff)
parent6a7f167f67586921d372121327087e492da60188 (diff)
Merge "docs: fixing bug 36982027 and 30636712, typos" into oc-mr1-dev
Diffstat (limited to 'rs/java/android/renderscript/ScriptIntrinsic.java')
-rw-r--r--rs/java/android/renderscript/ScriptIntrinsic.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/rs/java/android/renderscript/ScriptIntrinsic.java b/rs/java/android/renderscript/ScriptIntrinsic.java
index 4edce84ea3e3..61211a25f8af 100644
--- a/rs/java/android/renderscript/ScriptIntrinsic.java
+++ b/rs/java/android/renderscript/ScriptIntrinsic.java
@@ -17,9 +17,9 @@
package android.renderscript;
/**
- * Base class for all Intrinsic scripts. An intrinsic a script
- * which implements a pre-defined function. Intrinsics are
- * provided to provide effecient implemtations of common
+ * Base class for all Intrinsic scripts. An intrinsic is a script
+ * that implements a pre-defined function. Intrinsics are
+ * provided to provide efficient implementations of common
* operations.
*
* Not intended for direct use.