Merge branch 'tizen_3.0' into tizen 06/107606/2 accepted/tizen_common accepted/tizen_ivi accepted/tizen_mobile accepted/tizen_tv accepted/tizen_wearable accepted/tizen/common/20161229.140147 accepted/tizen/ivi/20161229.233205 accepted/tizen/mobile/20161229.233105 accepted/tizen/tv/20161229.233127 accepted/tizen/unified/20170309.031648 accepted/tizen/wearable/20161229.233146 submit/tizen/20161229.040631 submit/tizen_unified/20170308.100404
authortaeyoung <ty317.kim@samsung.com>
Thu, 29 Dec 2016 01:26:53 +0000 (10:26 +0900)
committertaeyoung <ty317.kim@samsung.com>
Thu, 29 Dec 2016 01:30:45 +0000 (10:30 +0900)
Change-Id: I6b11abc7caccb7bc53a8172c5dc300ad0be827f2
Signed-off-by: taeyoung <ty317.kim@samsung.com>

Trivial merge