Merge branch 'master' into tizen_3.0 accepted/tizen/3.0/common/20161122.063837 accepted/tizen/3.0/mobile/20161122.035455 submit/tizen_3.0/20161121.043705
authorWoochan Lee <wc0917.lee@samsung.com>
Mon, 21 Nov 2016 04:33:45 +0000 (13:33 +0900)
committerWoochan Lee <wc0917.lee@samsung.com>
Mon, 21 Nov 2016 04:33:45 +0000 (13:33 +0900)

Trivial merge