Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "docs: fixing bug 36982027 and 30636712, typos" into oc-mr1-dev am: 5b0a4eea8d" into pi-dev

Browse Source 
am: ba22b7f4fd

Change-Id: I73239a97490ea456d5c7d7413e1277307c4caec8
This commit is contained in:
Todd Kopriva
2018-03-23 23:36:28 +00:00
committed by android-build-merger
parent fe6e6f4345 ba22b7f4fd
commit 1e72ce692a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/view/View.java
View File

@@ -14340,7 +14340,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.
*/

6
rs/java/android/renderscript/ScriptIntrinsic.java
View File

@@ -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.