Merge branch 'tizen_30' into tizen_40 submit/tizen/20161227.152258
authorjaekuk, lee <juku1999@samsung.com>
Tue, 27 Dec 2016 15:22:46 +0000 (00:22 +0900)
committerjaekuk, lee <juku1999@samsung.com>
Tue, 27 Dec 2016 15:22:46 +0000 (00:22 +0900)

Trivial merge