resolved conflicts for merge of de7bdc94 to master

Change-Id: I6dc10c8220c0984b31a05534b576ca25afdf5383
2014-06-20 11:46:40 -07:00 · 2014-06-20 11:46:40 -07:00 · 4614f5097c
parent 545b127a78
commit 4614f5097c
1 changed files with 1 additions and 1 deletions
--- a/healthd/healthd.cpp
+++ b/healthd/healthd.cpp
@ -205,7 +205,7 @@ static void periodic_chores() {
    healthd_battery_update();
 }

-#define UEVENT_MSG_LEN 1024
+#define UEVENT_MSG_LEN 2048
 static void uevent_event(uint32_t /*epevents*/) {
    char msg[UEVENT_MSG_LEN+2];
    char *cp;