Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a2d959e authored by Joshua Baxter's avatar Joshua Baxter Committed by android-build-merger
Browse files

Merge "docs: fixed a couple of typos" into oc-mr1-dev 

am: 651ffd42

Change-Id: Ie6fb97aae76637023657d751f6ad0ebbc74ff284
parents f50e78d8 651ffd42

core/java/android/app/Activity.java

+1 −1
Original line number Diff line number Diff line
@@ -425,7 +425,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.</p>

 *

 * <p class="note">For applications targeting platforms starting with

core/java/android/content/Intent.java

+2 −2
Original line number Diff line number Diff line
@@ -266,8 +266,8 @@ import java.util.Set; 
 * </ul>

 *

 * <p>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.</p>

 *

 * <pre> &lt;manifest xmlns:android="http://schemas.android.com/apk/res/android"