Merge branch '2.0_beta' of ssh://tizendev.org:29418/apps/home/settings into 2.0_beta

diff --git a/include/setting-debug.h b/include/setting-debug.h
index e8c04a8..372e6c5 100755 (executable)
--- a/include/setting-debug.h
+++ b/include/setting-debug.h
@@ -85,7 +85,7 @@
 /*#endif*/
 
 #define SUPPORT_APP_ROATION                    0
-#define SUPPORT_LCD_TIMEOUT_KEEPING            1
+#define SUPPORT_LCD_TIMEOUT_KEEPING            0
 #define USE_DEVICE_SET_DISPLAY_BRT             1
 
 #define  LOW_BATTERY_DO_NOTHING                        1       /**< 1 : turn the low batter handlding off */