Merge branch 'devel/tizen_2.4' into tizen 27/53127/2
authorPrajwal A N <an.prajwal@samsung.com>
Tue, 1 Dec 2015 23:46:00 +0000 (08:46 +0900)
committerPrajwal A N <an.prajwal@samsung.com>
Wed, 2 Dec 2015 04:57:31 +0000 (13:57 +0900)
commitcaf89f5e45a69f412f00346d8aa3c15b3c25bdc7
tree68a7c2ab579bc0db82383a943413443b294bc6eb
parent5cb3798d4312e7993ddbfd4bf1472aef0474ecad
parent03b371533eddc37bf0ba5b86447d7cf29c858408
Merge branch 'devel/tizen_2.4' into tizen

Signed-off-by: Prajwal A N <an.prajwal@samsung.com>
Change-Id: Ib4e8153b78c98d926d8f32ac2c3a47deee67b567
25 files changed:
CMakeLists.txt
data/resourced_proc_exclude.ini
packaging/resourced.spec
src/CMakeLists.txt
src/block/block-monitor.c
src/freezer/freezer.c
src/freezer/libsystem-freezer.so.arm64
src/freezer/libsystem-freezer.so.armv7l
src/heart/decision.c
src/heart/heart.c
src/heart/logging.c
src/mem-stress/mem-stress.c
src/memory/vmpressure-lowmem-handler.c
src/memps/CMakeLists.txt
src/network/CMakeLists.txt
src/network/datausage-common.c
src/proc-stat/CMakeLists.txt
src/proc-stat/proc-appusage.c
src/proc-stat/proc-info.c
src/proc-stat/proc-main.c
src/resourced-dbus/resourced-dbus.c
src/resourced/resourced.service
src/sluggish/sluggish.c
src/swap/swap.c
src/timer-slack/timer-slack.c