From 9a841a65190a3b825cfe738ebcd4afaaf99e07ff Mon Sep 17 00:00:00 2001 From: Joshua Baxter Date: Tue, 27 Mar 2018 14:42:03 -0700 Subject: [PATCH] docs: fixed a couple of typos Test: make ds-docs Bug: 36948822 Bug: 36946883 Change-Id: I4de699dc7d5a69e456b0656de890f76b9787aafa --- core/java/android/app/Activity.java | 2 +- core/java/android/content/Intent.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index c349ab3c4abea..060b5d8319286 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -414,7 +414,7 @@ import java.util.List; * vs. those targeting prior platforms. Starting with Honeycomb, an application * is not in the killable state until its {@link #onStop} has returned. This * impacts when {@link #onSaveInstanceState(Bundle)} may be called (it may be - * safely called after {@link #onPause()} and allows and application to safely + * safely called after {@link #onPause()}) and allows an application to safely * wait until {@link #onStop()} to save persistent state.

* *

For those methods that are not marked as being killable, the activity's diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 39dd964df1eb1..c863fe0cff1f2 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -264,8 +264,8 @@ import java.util.Set; * * *

For example, consider the Note Pad sample application that - * allows user to browse through a list of notes data and view details about - * individual items. Text in italics indicate places were you would replace a + * allows a user to browse through a list of notes data and view details about + * individual items. Text in italics indicates places where you would replace a * name with one specific to your own package.

* *
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"