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/TextView.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/TextView.java')
| -rw-r--r-- | core/java/android/widget/TextView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 4c0163ef89da..8a199275b123 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -3572,7 +3572,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener /** * Read the Text Appearance attributes from a given TypedArray and set its values to the given * set. If the TypedArray contains a value that was already set in the given attributes, that - * will be overriden. + * will be overridden. * * @param context The Context to be used * @param appearance The TypedArray to read properties from |