Merge branch 'tizen' into tizen_3.0 77/98877/1
authorKichan Kwon <k_c.kwon@samsung.com>
Mon, 21 Nov 2016 05:36:34 +0000 (14:36 +0900)
committerKichan Kwon <k_c.kwon@samsung.com>
Mon, 21 Nov 2016 05:43:51 +0000 (14:43 +0900)
Change-Id: I24c32bc9ccf3e0ac85f5b84c26b57d2ded02c909
Signed-off-by: Kichan Kwon <k_c.kwon@samsung.com>

Trivial merge