Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp

2009-10-08 20:30:41 -07:00
parent a6a96cf40e 0051660cea
commit 6815a67c53
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