Merge branch 'master' into tizen_3.0 accepted/tizen/3.0/common/20161215.162846 accepted/tizen/3.0/mobile/20161215.043615 submit/tizen_3.0/20161214.081217
authorWoochan Lee <wc0917.lee@samsung.com>
Wed, 14 Dec 2016 08:09:58 +0000 (17:09 +0900)
committerWoochan Lee <wc0917.lee@samsung.com>
Wed, 14 Dec 2016 08:09:58 +0000 (17:09 +0900)

Trivial merge