Merge branch 'master' into tizen_3.0 accepted/tizen_3.0.m2_mobile tizen_3.0.m2 accepted/tizen/3.0.m2/mobile/20170104.142926 accepted/tizen/3.0/common/20161223.110849 accepted/tizen/3.0/mobile/20161223.082322 submit/tizen_3.0.m2/20170104.093752 submit/tizen_3.0/20161223.053152
authorWoochan Lee <wc0917.lee@samsung.com>
Fri, 23 Dec 2016 05:30:24 +0000 (14:30 +0900)
committerWoochan Lee <wc0917.lee@samsung.com>
Fri, 23 Dec 2016 05:30:24 +0000 (14:30 +0900)

Trivial merge