summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorkopriva <kopriva@google.com>2018-10-01 12:46:25 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-10-01 12:46:25 -0700
commitd896dbd6db4232b60bc16394e1224fc963ab4137 (patch)
treee53402945693ac0763d7cf7d081e9880775c00c3 /core/java
parent9d3e4dfd969d2b7b1385d01a7a537092f3f2022c (diff)
parent978a89cfcbcccac740bcf98574c04f0bd1d295df (diff)
Merge "docs: bug 72853855, wrong parameter" into pi-dev am: 1f86e2f4ca
am: 978a89cfcb Change-Id: Id1a616342ae1198d9f44718087dac3700686025c
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/view/View.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 78e6dd8fb139..b2944d6a9923 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -15636,7 +15636,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
/**
* Sets the visual z position of this view, in pixels. This is equivalent to setting the
* {@link #setTranslationZ(float) translationZ} property to be the difference between
- * the x value passed in and the current {@link #getElevation() elevation} property.
+ * the z value passed in and the current {@link #getElevation() elevation} property.
*
* @param z The visual z position of this view, in pixels.
*/