Merge branch 'tizen_3.0' into tizen 68/115568/1
authorKichan Kwon <k_c.kwon@samsung.com>
Mon, 20 Feb 2017 10:29:45 +0000 (19:29 +0900)
committerKichan Kwon <k_c.kwon@samsung.com>
Mon, 20 Feb 2017 10:31:19 +0000 (19:31 +0900)
commit92f501816e80b0ad5f44824fbe00239b368f936a
treef6a1c2e1af1cdd846ba5e137586f7a44ed926d25
parent2e0fab7271d810a648a563b83e42e7d6d1dbae72
parentf503660e8a7664f738e81e49f5b8e58c10bed827
Merge branch 'tizen_3.0' into tizen

Change-Id: I5af804e7f0c19044071d805096102f72b2462d15
Signed-off-by: Kichan Kwon <k_c.kwon@samsung.com>
src/proc-stat/proc-main.c