summaryrefslogtreecommitdiff
path: root/core/java/android/view/View.java
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-02-14 22:11:32 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-02-14 22:11:32 +0000
commit07ec9dbec5945e5e97c1b2842acdba6f74e6ebbc (patch)
tree4da966be25185356ad2186dca8fde9debfeccf8f /core/java/android/view/View.java
parent98e94aee7ca7653b06301de157d0af6ca1df9531 (diff)
parent0e71b4f19ba602c8c646744e690ab01c69808b42 (diff)
Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master" into stage-aosp-master
Diffstat (limited to 'core/java/android/view/View.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 efff6d617376..48aa576c1e91 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -15584,7 +15584,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.
*/