Merge branch 'tizen_2.3' into tizen_2.4
authorSung-jae Park <nicesj.park@samsung.com>
Mon, 18 May 2015 03:13:15 +0000 (12:13 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Mon, 18 May 2015 03:13:19 +0000 (12:13 +0900)
Change-Id: I393e98535536afeeed87edc96691a24a4d23b1ed
Signed-off-by: Sung-jae Park <nicesj.park@samsung.com>
1  2 
src/slave_life.c

Simple merge