summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Kevin Hufnagle <khufnagle@google.com> 2016-03-15 17:25:20 +0000
committer android-build-merger <android-build-merger@google.com> 2016-03-15 17:25:20 +0000
commit1e74d0eb108172471d42c1699a19947f777dbabe (patch)
treec8f2ab8ca0a38c7c815026bebfa1748cd02b3863
parentdbf18a0b6d3214482f17e9c1f9fc532d724d43e6 (diff)
parentf899e7862353cdacf1cec0f638a0a4924d872fb1 (diff)
Merge "doc change: Fixed typo in Activity class reference." into mnc-docs
am: f899e78623 * commit 'f899e7862353cdacf1cec0f638a0a4924d872fb1': doc change: Fixed typo in Activity class reference.
-rw-r--r--core/java/android/app/Activity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index dbddc1dc949f..a5565638278c 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -660,7 +660,7 @@ import java.util.List;
* independently of the activity lifecycle itself. An example may be a camera
* application that allows you to upload a picture to a web site. The upload
* may take a long time, and the application should allow the user to leave
- * the application will it is executing. To accomplish this, your Activity
+ * the application while it is executing. To accomplish this, your Activity
* should start a {@link Service} in which the upload takes place. This allows
* the system to properly prioritize your process (considering it to be more
* important than other non-visible applications) for the duration of the