Merge "docs: fixing bug 36982027 and 30636712, typos" into oc-mr1-dev
am: 5b0a4eea8d
Change-Id: Iff4044c52e7ccdf6f7f879b9d5457ce1458b21bd
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 63f4824..a0d8c25 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -14340,7 +14340,7 @@
}
/**
- * Return the width of the your view.
+ * Return the width of your view.
*
* @return The width of your view, in pixels.
*/
diff --git a/rs/java/android/renderscript/ScriptIntrinsic.java b/rs/java/android/renderscript/ScriptIntrinsic.java
index 4edce84..61211a2 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.