summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorkopriva <kopriva@google.com>2018-10-01 12:03:55 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-10-01 12:03:55 -0700
commit978a89cfcbcccac740bcf98574c04f0bd1d295df (patch)
tree7cb081333f59635952fcbc8d8acdcc3e0c8e3929 /core/java/android
parent3bc799f6dcaf927c4bf0565e6c236ad1377d6033 (diff)
parent1f86e2f4cac7f0051abb17f3c1ed2d08a12e234f (diff)
Merge "docs: bug 72853855, wrong parameter" into pi-dev
am: 1f86e2f4ca Change-Id: I95b3d8fe6ca585a5dc4168ced763ae1a9a70feb7
Diffstat (limited to 'core/java/android')
-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 0e5f25055c7e..368028f52e27 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -15592,7 +15592,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.
*/