Merge branch 'tizen_3.0' into tizen 07/107607/1 accepted/tizen/common/20161229.140119 accepted/tizen/ivi/20161229.233155 accepted/tizen/mobile/20161229.233048 accepted/tizen/tv/20161229.233117 accepted/tizen/wearable/20161229.233136 submit/tizen/20161229.040631
authortaeyoung <ty317.kim@samsung.com>
Thu, 29 Dec 2016 01:37:59 +0000 (10:37 +0900)
committertaeyoung <ty317.kim@samsung.com>
Thu, 29 Dec 2016 01:37:59 +0000 (10:37 +0900)
Signed-off-by: taeyoung <ty317.kim@samsung.com>
Change-Id: Ife2facb5e34e5d7684935a59a13562c4bee61d7c


Trivial merge