summaryrefslogtreecommitdiff
path: root/rs
diff options
context:
space:
mode:
authorTodd Kopriva <kopriva@google.com>2018-03-23 22:11:38 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-03-23 22:11:38 +0000
commit1057fc37f52c4353abfdba9de9ed929864b5e833 (patch)
tree33d580b6bdc9c8da11e5dee56590d8bd33670bd9 /rs
parent87f9818319fec1227cadd4fe3566409e71386d73 (diff)
parent5b0a4eea8dd4c36d4501d053869fce1cd8a8ee82 (diff)
Merge "docs: fixing bug 36982027 and 30636712, typos" into oc-mr1-dev
am: 5b0a4eea8d Change-Id: Iff4044c52e7ccdf6f7f879b9d5457ce1458b21bd
Diffstat (limited to 'rs')
-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.