merge tizen_3.0 to tizen branch 98/110098/2
authorlokilee73 <changjoo.lee@samsung.com>
Fri, 13 Jan 2017 02:03:27 +0000 (11:03 +0900)
committerlokilee73 <changjoo.lee@samsung.com>
Fri, 13 Jan 2017 02:07:28 +0000 (11:07 +0900)
Change-Id: I400a2d951c77e1a432fbcf80e9731333515928cc
Signed-off-by: lokilee73 <changjoo.lee@samsung.com>

Trivial merge