diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-07-20 19:50:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-20 19:50:50 +0000 |
| commit | 78ead58df03e476d656c7e875fff9ade13b727c1 (patch) | |
| tree | 6ee65539bc80c39aa9f9eb99d947cc330fe5f30d /core/java/android/app/ActivityManager.java | |
| parent | bde85f741c2ccbb7d719cdf0a48a607b104c3943 (diff) | |
| parent | 17f693520da8977c4a60f5b4be3be035cba7146c (diff) | |
Merge "Fix issue #22531747: Assist info should declare if user has disabled..." into mnc-dev
Diffstat (limited to 'core/java/android/app/ActivityManager.java')
| -rw-r--r-- | core/java/android/app/ActivityManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index 9ca206a42c00..55b2fd92c824 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -2807,7 +2807,7 @@ public class ActivityManager { /** * Request that the system start watching for the calling process to exceed a pss - * size as given here. Once called, the system will look for any occassions where it + * size as given here. Once called, the system will look for any occasions where it * sees the associated process with a larger pss size and, when this happens, automatically * pull a heap dump from it and allow the user to share the data. Note that this request * continues running even if the process is killed and restarted. To remove the watch, |