Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

This commit is contained in:
Yohei Yukawa
2015-12-03 20:01:03 +00:00
committed by android-build-merger

View File

@@ -48,7 +48,8 @@ public class RecentsTaskLoadPlan {
private static boolean DEBUG = false;
private static int MIN_NUM_TASKS = 5;
private static int SESSION_BEGIN_TIME = 60 /* s/min */ * 60 /* min/hr */ * 6 /* hrs */;
private static int SESSION_BEGIN_TIME = 1000 /* ms/s */ * 60 /* s/min */ * 60 /* min/hr */ *
6 /* hrs */;
/** The set of conditions to load tasks. */
public static class Options {