Merge branch 'master' into tizen_3.0 accepted/tizen/3.0/common/20161212.060620 accepted/tizen/3.0/mobile/20161212.023932 submit/tizen_3.0/20161210.071506
authorWoochan Lee <wc0917.lee@samsung.com>
Sat, 10 Dec 2016 07:12:19 +0000 (16:12 +0900)
committerWoochan Lee <wc0917.lee@samsung.com>
Sat, 10 Dec 2016 07:12:19 +0000 (16:12 +0900)

Trivial merge