summaryrefslogtreecommitdiffstats
path: root/core/java/android/view/View.java
diff options
context:
space:
mode:
authorChet Haase <chet@google.com>2013-09-05 10:13:34 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-05 10:13:34 -0700
commit672fcd5c9a90ed4e133d441fee3b0130c7acd769 (patch)
tree07c0f7202e24954b54200394118f0d65f0aab249 /core/java/android/view/View.java
parent97f3c7d8a58309791c7670e8c137143a0114163b (diff)
parent04f31501602a87ae9526983f4a92e623b4d68bb3 (diff)
downloadframeworks_base-672fcd5c9a90ed4e133d441fee3b0130c7acd769.zip
frameworks_base-672fcd5c9a90ed4e133d441fee3b0130c7acd769.tar.gz
frameworks_base-672fcd5c9a90ed4e133d441fee3b0130c7acd769.tar.bz2
am 04f31501: am a9fa33b3: Merge "Change build version from KEY_LIME_PIE to KITKAT" into klp-dev
* commit '04f31501602a87ae9526983f4a92e623b4d68bb3': Change build version from KEY_LIME_PIE to KITKAT
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 f2b3e89..ce9cdfa 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -8834,7 +8834,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* Change the view's z order in the tree, so it's on top of other sibling
* views. This ordering change may affect layout, if the parent container
* uses an order-dependent layout scheme (e.g., LinearLayout). Prior
- * to {@link android.os.Build.VERSION_CODES#KEY_LIME_PIE} this
+ * to {@link android.os.Build.VERSION_CODES#KITKAT} this
* method should be followed by calls to {@link #requestLayout()} and
* {@link View#invalidate()} on the view's parent to force the parent to redraw
* with the new child ordering.