Merge branch 'master' into tizen_3.0 accepted/tizen/3.0/common/20161213.163806 accepted/tizen/3.0/mobile/20161213.024905 submit/tizen_3.0/20161212.102202
authorWoochan Lee <wc0917.lee@samsung.com>
Mon, 12 Dec 2016 10:20:46 +0000 (19:20 +0900)
committerWoochan Lee <wc0917.lee@samsung.com>
Mon, 12 Dec 2016 10:20:46 +0000 (19:20 +0900)

Trivial merge