Merge branch 'tizen_3.0' into tizen 74/109874/1 accepted/tizen/common/20170113.183727 accepted/tizen/ivi/20170113.224056 accepted/tizen/mobile/20170113.224007 accepted/tizen/tv/20170113.224021 accepted/tizen/wearable/20170113.224038 submit/tizen/20170113.015141
authorYunmi Ha <yunmi.ha@samsung.com>
Thu, 12 Jan 2017 06:11:04 +0000 (15:11 +0900)
committerYunmi Ha <yunmi.ha@samsung.com>
Thu, 12 Jan 2017 06:11:46 +0000 (15:11 +0900)
Change-Id: Icdd251ed111e66299123dcfb05ffa6088741ebc4
Signed-off-by: Yunmi Ha <yunmi.ha@samsung.com>

Trivial merge