summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorkopriva <kopriva@google.com>2018-10-01 12:27:21 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-10-01 12:27:21 -0700
commit28a83c8fb7a002b1ca2ee98afd4cedc18dd64507 (patch)
tree3e1c2d2c053526041080d00b4179f3709f6e300a /core/java
parent2600cebdf69958b278635e626b077d017ed30086 (diff)
parentbfa9ed00e047c1cb150a40e649e85fc5b98f3126 (diff)
Merge "docs: bug 112769174, unclosed parentheses" into pi-dev am: 6ee6799c03
am: bfa9ed00e0 Change-Id: Ic43aa5f66b42fea13ccf1d881ff2c4707a7cc53d
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/app/Activity.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index 2acae1cf8bac..482ef2d1a6fd 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -394,7 +394,7 @@ import java.util.List;
* <td>The final call you receive before your
* activity is destroyed. This can happen either because the
* activity is finishing (someone called {@link Activity#finish} on
- * it, or because the system is temporarily destroying this
+ * it), or because the system is temporarily destroying this
* instance of the activity to save space. You can distinguish
* between these two scenarios with the {@link
* Activity#isFinishing} method.</td>
@@ -1985,7 +1985,7 @@ public class Activity extends ContextThemeWrapper
/**
* Perform any final cleanup before an activity is destroyed. This can
* happen either because the activity is finishing (someone called
- * {@link #finish} on it, or because the system is temporarily destroying
+ * {@link #finish} on it), or because the system is temporarily destroying
* this instance of the activity to save space. You can distinguish
* between these two scenarios with the {@link #isFinishing} method.
*