Merge branch 'tizen_base' into tizen 14/166114/1 tizen
authorDongHun Kwak <dh0128.kwak@samsung.com>
Mon, 8 Jan 2018 04:08:56 +0000 (13:08 +0900)
committerDongHun Kwak <dh0128.kwak@samsung.com>
Mon, 8 Jan 2018 04:09:02 +0000 (13:09 +0900)
Change-Id: I644c886e71cfb7b09b35b8ef7744744a1dee79b4
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

Trivial merge