summaryrefslogtreecommitdiffstats
path: root/services/java/com/android/server/am/ActivityManagerService.java
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2014-05-07 03:33:37 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-07 03:33:37 +0000
commitf2db00fdcd4e3dd97afd071f3af058d307a152f9 (patch)
tree35f84cacf9e31e014a6ea3dfdff25a3dcc990366 /services/java/com/android/server/am/ActivityManagerService.java
parentcc6b9eb23c3a6168d6cb5cb10977c43ebdcbbea4 (diff)
parentedb88bcd232176e575f2dbee2cfdb1bfbe33faef (diff)
downloadframeworks_base-f2db00fdcd4e3dd97afd071f3af058d307a152f9.zip
frameworks_base-f2db00fdcd4e3dd97afd071f3af058d307a152f9.tar.gz
frameworks_base-f2db00fdcd4e3dd97afd071f3af058d307a152f9.tar.bz2
am edb88bcd: Merge "Use package usage information to decide what dex files to optimize in PackageManagerService"
* commit 'edb88bcd232176e575f2dbee2cfdb1bfbe33faef': Use package usage information to decide what dex files to optimize in PackageManagerService
Diffstat (limited to 'services/java/com/android/server/am/ActivityManagerService.java')
-rw-r--r--services/java/com/android/server/am/ActivityManagerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index 3849ab1..6e5c746 100644
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -924,7 +924,7 @@ public final class ActivityManagerService extends ActivityManagerNative
/**
* This is set if we had to do a delayed dexopt of an app before launching
- * it, to increasing the ANR timeouts in that case.
+ * it, to increase the ANR timeouts in that case.
*/
boolean mDidDexOpt;