summaryrefslogtreecommitdiff
path: root/core/java/android/widget/LinearLayout.java
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2019-02-09 02:33:11 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2019-02-09 02:33:11 +0000
commit04898ff564fbda6d58693631ea633611585f8921 (patch)
tree34a2d301ba6d8683436a6ce04d6751fa1cf3b94d /core/java/android/widget/LinearLayout.java
parent9fcdc1f9e0debe71f79cd430874208e9532178e8 (diff)
parenteb71e821edd929d48a824a9a4bbdfb710b50d324 (diff)
Snap for 5180536 from eb71e821edd929d48a824a9a4bbdfb710b50d324 to pi-platform-release
Change-Id: I7c5a9c9e96572c32eadd97448c4886f9c9150a19
Diffstat (limited to 'core/java/android/widget/LinearLayout.java')
-rw-r--r--core/java/android/widget/LinearLayout.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/widget/LinearLayout.java b/core/java/android/widget/LinearLayout.java
index 40f9652c4c9b..44d71038c23b 100644
--- a/core/java/android/widget/LinearLayout.java
+++ b/core/java/android/widget/LinearLayout.java
@@ -644,7 +644,7 @@ public class LinearLayout extends ViewGroup {
}
/**
- * <p>Returns the view at the specified index. This method can be overriden
+ * <p>Returns the view at the specified index. This method can be overridden
* to take into account virtual children. Refer to
* {@link android.widget.TableLayout} and {@link android.widget.TableRow}
* for an example.</p>
@@ -1518,7 +1518,7 @@ public class LinearLayout extends ViewGroup {
/**
* <p>Measure the child according to the parent's measure specs. This
- * method should be overriden by subclasses to force the sizing of
+ * method should be overridden by subclasses to force the sizing of
* children. This method is called by {@link #measureVertical(int, int)} and
* {@link #measureHorizontal(int, int)}.</p>
*