diff options
| author | 2018-03-23 21:48:55 +0000 | |
|---|---|---|
| committer | 2018-03-23 21:48:55 +0000 | |
| commit | 5b0a4eea8dd4c36d4501d053869fce1cd8a8ee82 (patch) | |
| tree | 9b15ec07d6d3de4230652ecef0b4c1284e434a8b | |
| parent | 60b06bd217a92279c89ae2743285c7e3cfaeb5af (diff) | |
| parent | 6a7f167f67586921d372121327087e492da60188 (diff) | |
Merge "docs: fixing bug 36982027 and 30636712, typos" into oc-mr1-dev
| -rw-r--r-- | core/java/android/view/View.java | 2 | ||||
| -rw-r--r-- | rs/java/android/renderscript/ScriptIntrinsic.java | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 166d6b7a5b1c..8d24d1ec294a 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -13649,7 +13649,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, } /** - * 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 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. |