Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 9a2d959eff

Change-Id: I02788adeb444186d8d9e0471fe326d090d9199d7
This commit is contained in:
Joshua Baxter
2018-03-28 23:08:09 +00:00
committed by android-build-merger
parent e84e4239f4 9a2d959eff
commit affc3087f5
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/Activity.java
View File

@@ -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

4
core/java/android/content/Intent.java
View File

@@ -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"