Merge branch 'tizen_2.3' into tizen_2.4
authorSung-jae Park <nicesj.park@samsung.com>
Fri, 8 May 2015 09:13:11 +0000 (18:13 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Fri, 8 May 2015 09:13:14 +0000 (18:13 +0900)
commit950ec812b50a198e5dbba569bcf38e5f9e1ce0e9
tree2fbc89e0a8cdfea659ca70e0e061bf2fb943eb86
parent224246628358e1d4c2791ddfdcdc7d4e6f5ca67b
parent67559821850ac5bcf72e3ae4418116a367d3ee57
Merge branch 'tizen_2.3' into tizen_2.4

Change-Id: I40cbab0e2d5dc9fbed56a3ddc280198da6bbd96f
Signed-off-by: Sung-jae Park <nicesj.park@samsung.com>
src/slave_life.c