Merge branch 'tizen_3.0' into tizen
authortaeyoung <ty317.kim@samsung.com>
Thu, 29 Dec 2016 02:04:50 +0000 (11:04 +0900)
committertaeyoung <ty317.kim@samsung.com>
Thu, 29 Dec 2016 02:04:50 +0000 (11:04 +0900)
Signed-off-by: taeyoung <ty317.kim@samsung.com>
Change-Id: I427628bdbc596c6dd5af731f3f75654bb25087a4


Trivial merge