Merge branch 'tizen' into tizen_dev

Change-Id: I5deecde8d1044792fbf8021c5ce74d692d1e217a
Signed-off-by: Andrey Klimenko <and.klimenko@samsung.com>

diff --cc src/common-efl.c
index 4beb4f7,1581f1e..ee968ba
--- 1/src/common-efl.c
--- 2/src/common-efl.c
+++ b/src/common-efl.c
@@@ -17,10 -17,9 +17,10 @@@
  
  #include "pkgmgr-setting-info.h"
  #include "common-efl.h"
- #include "set-scedule-info.h"
+ #include "set-schedule-info.h"
  #include "allowed-calls.h"
  #include "lock_screen_content.h"
 +#include "app-details.h"
  
  #define ICON_SIZE 82
  

diff --cc src/notification-setting-info.c
Simple merge