summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2018-09-18 00:04:39 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2018-09-18 00:04:39 +0000
commit9a32a1dc3e25bbae9baffa9f16aadec085f54354 (patch)
tree1b7820b1ccd3856953598630261efdfa6e058445
parentdf0cefab6bcc9f938eda0c463b6d8faceaa5e11d (diff)
parentfc3949e0992f52bd2f3f2be41b51a8b3ef786d9b (diff)
Merge "docs: bug 36997358, typo 'than an'" into pi-dev
-rw-r--r--core/java/android/app/Activity.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index 68e8a52a9c24..f765620a2eb9 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -544,12 +544,12 @@ import java.util.List;
* <a name="SavingPersistentState"></a>
* <h3>Saving Persistent State</h3>
*
- * <p>There are generally two kinds of persistent state than an activity
+ * <p>There are generally two kinds of persistent state that an activity
* will deal with: shared document-like data (typically stored in a SQLite
* database using a {@linkplain android.content.ContentProvider content provider})
* and internal state such as user preferences.</p>
*
- * <p>For content provider data, we suggest that activities use a
+ * <p>For content provider data, we suggest that activities use an
* "edit in place" user model. That is, any edits a user makes are effectively
* made immediately without requiring an additional confirmation step.
* Supporting this model is generally a simple matter of following two rules:</p>