Merge branch 'tizen_dev' into tizen 71/87071/1 submit/tizen/20160906.075759
authorAndrey Klimenko <and.klimenko@samsung.com>
Tue, 6 Sep 2016 07:38:10 +0000 (10:38 +0300)
committerAndrey Klimenko <and.klimenko@samsung.com>
Tue, 6 Sep 2016 07:38:10 +0000 (10:38 +0300)
commit47225051fb9b86493272d47190f9b2f087394644
tree60e931fe28e85a4977768190b97a9e1c8f4abc12
parent3b52d3a3286c27c35605661453ac71dc8e8743cf
parentad3ae3077d90e1cd60d5eaa63179fe10c0746ab4
Merge branch 'tizen_dev' into tizen

Signed-off-by: Andrey Klimenko <and.klimenko@samsung.com>
Conflicts:
src/Common/SystemSettingsManager/inc/SystemSettingsManager.h
src/Common/SystemSettingsManager/src/SystemSettingsManager.cpp
src/MsgThread/Controller/src/MsgThread.cpp

Change-Id: Iacd2b2c78c01a175c0ca916cdccc6c824e40cf56
src/Common/SystemSettingsManager/inc/SystemSettingsManager.h
src/Common/SystemSettingsManager/src/SystemSettingsManager.cpp
src/MsgThread/Controller/src/MsgThread.cpp