Merge branch 'tizen_30' into tizen_40 submit/tizen/20170109.152244
authorjaekuk, lee <juku1999@samsung.com>
Mon, 9 Jan 2017 15:22:27 +0000 (00:22 +0900)
committerjaekuk, lee <juku1999@samsung.com>
Mon, 9 Jan 2017 15:22:27 +0000 (00:22 +0900)

Trivial merge