Merge branch 'tizen_3.0' into tizen accepted/tizen/common/20161228.162702 submit/tizen/20161228.095357
authorHyunjin Park <hj.na.park@samsung.com>
Wed, 28 Dec 2016 09:38:40 +0000 (18:38 +0900)
committerHyunjin Park <hj.na.park@samsung.com>
Wed, 28 Dec 2016 09:38:40 +0000 (18:38 +0900)

Trivial merge