Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e72ce69 authored by Todd Kopriva's avatar Todd Kopriva Committed by android-build-merger
Browse files

Merge "Merge "docs: fixing bug 36982027 and 30636712, typos" into oc-mr1-dev... 

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

Change-Id: I73239a97490ea456d5c7d7413e1277307c4caec8
parents fe6e6f43 ba22b7f4

core/java/android/view/View.java

+1 −1
Original line number Diff line number Diff line
@@ -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.















     */

























rs/java/android/renderscript/ScriptIntrinsic.java



+3
−3




























Original line number
Diff line number
Diff line








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