diff options
| author | 2018-09-17 17:31:12 -0700 | |
|---|---|---|
| committer | 2018-09-17 17:31:12 -0700 | |
| commit | 33d19aac6aab8971d535cda79d5ceda0cc2ceae9 (patch) | |
| tree | 0e957cd22c934a94c10bda8af8a6366f9dc142ef | |
| parent | f79aa139727493f0bfc5e603efd7ad6da0a94c2e (diff) | |
| parent | 9a32a1dc3e25bbae9baffa9f16aadec085f54354 (diff) | |
Merge "docs: bug 36997358, typo 'than an'" into pi-dev
am: 9a32a1dc3e
Change-Id: I9d989ec02bd2d09f1a6de9ee15567a960caf9de2
| -rw-r--r-- | core/java/android/app/Activity.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index cdcba9b0d91a..1991677f309b 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -545,12 +545,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> |