Merge branch 'tizen_30' into tizen_40 submit/tizen/20161223.081611
authorjaekuk, lee <juku1999@samsung.com>
Fri, 23 Dec 2016 08:15:55 +0000 (17:15 +0900)
committerjaekuk, lee <juku1999@samsung.com>
Fri, 23 Dec 2016 08:15:55 +0000 (17:15 +0900)

Trivial merge