From 4614f5097c66991319576e9adb68a834aae19f9e Mon Sep 17 00:00:00 2001
From: Ruchi Kandoi <kandoiruchi@google.com>
Date: Fri, 20 Jun 2014 11:46:40 -0700
Subject: resolved conflicts for merge of de7bdc94 to master

Change-Id: I6dc10c8220c0984b31a05534b576ca25afdf5383
---
 healthd/healthd.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'healthd')

diff --git a/healthd/healthd.cpp b/healthd/healthd.cpp
index a1912f1..30a4b42 100644
--- 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;
-- 
cgit v1.1