diff options
| author | Kris Giesing <kgiesing@google.com> | 2014-12-19 23:56:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-19 23:56:44 +0000 |
| commit | 0dd962db3e66e725241565bb6e8d45d8383e3aeb (patch) | |
| tree | 59ecfd0eec1b8435b0a97e46c618a50ca639db43 /core/java/android/app | |
| parent | 2a38b6913fd28553abab67dfa0cfed7cabed6efa (diff) | |
| parent | 8b6216d31415e9b9377570ebc5b0727a16e36054 (diff) | |
| download | frameworks_base-0dd962db3e66e725241565bb6e8d45d8383e3aeb.zip frameworks_base-0dd962db3e66e725241565bb6e8d45d8383e3aeb.tar.gz frameworks_base-0dd962db3e66e725241565bb6e8d45d8383e3aeb.tar.bz2 | |
Merge "Fix minor spelling and grammar errors in public JavaDoc"
Diffstat (limited to 'core/java/android/app')
| -rw-r--r-- | core/java/android/app/Activity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 8cee587..bf0104c 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -362,7 +362,7 @@ import java.util.HashMap; * * <p>Note the "Killable" column in the above table -- for those methods that * are marked as being killable, after that method returns the process hosting the - * activity may killed by the system <em>at any time</em> without another line + * activity may be killed by the system <em>at any time</em> without another line * of its code being executed. Because of this, you should use the * {@link #onPause} method to write any persistent data (such as user edits) * to storage. In addition, the method |