Merge branch 'master' into tizen accepted/tizen/3.0/mobile/20161015.034321 accepted/tizen/common/20160930.175003 accepted/tizen/mobile/20160930.233358 submit/tizen/20160930.094404 submit/tizen_3.0_mobile/20161015.000007
authorWoochan Lee <wc0917.lee@samsung.com>
Fri, 30 Sep 2016 09:43:08 +0000 (18:43 +0900)
committerWoochan Lee <wc0917.lee@samsung.com>
Fri, 30 Sep 2016 09:43:08 +0000 (18:43 +0900)

Trivial merge