summaryrefslogtreecommitdiff
path: root/core/java/android/preference/PreferenceActivity.java
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2018-12-11 21:49:22 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-12-11 21:49:22 +0000
commitb73bb94aebec73b89f7ff429f1b2dffbea35ec98 (patch)
treeb34c831f34ffcf2cd0c0943324c0f681ac8cb5a6 /core/java/android/preference/PreferenceActivity.java
parent68b64b2639c88568a0a826bf395995413eca4b76 (diff)
parent75f75c18cc16334280bede33a468d44b34c56ee9 (diff)
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master" into stage-aosp-master
Diffstat (limited to 'core/java/android/preference/PreferenceActivity.java')
-rw-r--r--core/java/android/preference/PreferenceActivity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/preference/PreferenceActivity.java b/core/java/android/preference/PreferenceActivity.java
index d16390976d1f..8ed2605e9e8c 100644
--- a/core/java/android/preference/PreferenceActivity.java
+++ b/core/java/android/preference/PreferenceActivity.java
@@ -80,7 +80,7 @@ import java.util.List;
* <li>On a small screen it may display only the headers as a single list when first launched.
* Selecting one of the header items will only show the PreferenceFragment of that header (on
* Android N and lower a new Activity is launched).
- * <li>On a large screen in may display both the headers and current PreferenceFragment together as
+ * <li>On a large screen it may display both the headers and current PreferenceFragment together as
* panes. Selecting a header item switches to showing the correct PreferenceFragment for that item.
* </ul>
*