am 6903d5ce: Merge change Iee649a81 into eclair

Merge commit '6903d5cedcffa005818c497f672cf16c2dff619c' into eclair-mr2 * commit '6903d5cedcffa005818c497f672cf16c2dff619c': Add LAST_KMSG_KB variable, used to tune the size of /proc/last_kmsg uploads.
2009-10-08 20:24:20 -07:00
parent c93b88cf5f 6903d5cedc
commit e9d8f545bf
1 changed files with 5 additions and 0 deletions
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -3620,6 +3620,11 @@ public final class Settings {
         */
        public static final String SEND_ACTION_APP_ERROR = "send_action_app_error";

+        /**
+         * Maximum size of /proc/last_kmsg content to upload after reboot.
+         */
+        public static final String LAST_KMSG_KB = "last_kmsg_kb";
+
        /**
         * @deprecated
         * @hide