Merge branch 'devel/home/master'
authorSung-jae Park <nicesj.park@samsung.com>
Thu, 11 Dec 2014 03:23:38 +0000 (12:23 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Thu, 11 Dec 2014 03:23:40 +0000 (12:23 +0900)
Change-Id: Ica33c6f8f767e8618934af1e6c4ed015493cbdcf

1  2 
src/slave_life.c

Simple merge