Merge branch 'tizen_30' into tizen_40 submit/tizen/20161216.084300
authorjaekuk, lee <juku1999@samsung.com>
Fri, 16 Dec 2016 08:42:40 +0000 (17:42 +0900)
committerjaekuk, lee <juku1999@samsung.com>
Fri, 16 Dec 2016 08:42:40 +0000 (17:42 +0900)

Trivial merge