Merge branch 'tizen' into tizen_3.0 74/104774/1 accepted/tizen_3.0.m2_mobile accepted/tizen_3.0.m2_tv accepted/tizen_3.0.m2_wearable accepted/tizen_3.0_common accepted/tizen_3.0_ivi accepted/tizen_3.0_mobile accepted/tizen_3.0_tv accepted/tizen_3.0_wearable tizen_3.0 tizen_3.0.m2 tizen_3.0_tv accepted/tizen/3.0.m2/mobile/20170104.100306 accepted/tizen/3.0.m2/tv/20170104.100436 accepted/tizen/3.0.m2/wearable/20170104.101040 accepted/tizen/3.0/common/20161215.163435 accepted/tizen/3.0/ivi/20161215.044806 accepted/tizen/3.0/mobile/20161215.044739 accepted/tizen/3.0/tv/20161215.044745 accepted/tizen/3.0/wearable/20161215.044748 submit/tizen_3.0.m2/20170104.093748 submit/tizen_3.0/20161214.085314
authorSooyoung Ha <yoosah.ha@samsung.com>
Wed, 14 Dec 2016 08:48:14 +0000 (17:48 +0900)
committerSooyoung Ha <yoosah.ha@samsung.com>
Wed, 14 Dec 2016 08:48:19 +0000 (17:48 +0900)
Change-ID: I07059d6030efee1a26a723736625480846de975a
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>

Trivial merge