diff options
| author | Xin Li <delphij@google.com> | 2019-02-13 22:36:25 -0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2019-02-14 09:48:06 -0800 |
| commit | 0e71b4f19ba602c8c646744e690ab01c69808b42 (patch) | |
| tree | efc2d543fbec688c9a03de674fc2ee2d10da3474 /core/java/android/widget/LinearLayout.java | |
| parent | 5854e9312c43a7e47f4a44bcc344984242452c73 (diff) | |
| parent | 04898ff564fbda6d58693631ea633611585f8921 (diff) | |
DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into
stage-aosp-master
Bug: 124234733
Change-Id: Ic4f67fde0835da0b1c363906cccef0d244e38393
Diffstat (limited to 'core/java/android/widget/LinearLayout.java')
| -rw-r--r-- | core/java/android/widget/LinearLayout.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/widget/LinearLayout.java b/core/java/android/widget/LinearLayout.java index 452e9036cc54..f2e478d0e072 100644 --- a/core/java/android/widget/LinearLayout.java +++ b/core/java/android/widget/LinearLayout.java @@ -653,7 +653,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> @@ -1527,7 +1527,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> * |