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)
commit7465a4ccab9bae16121af0f1680854f049c0d7cf
tree2881a4d9ebaefebf0cb215bd461476fbbde5e92c
parentb610ef0d0a7a4a6a3779c4da98cb38f11111f953
parent295d507cf67f050314934a80caf57915c4eaf01f
Merge branch 'tizen_2.3' into tizen_2.4

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