Merge branch 'tizen_30' into tizen_40 submit/tizen/20161223.025800
authorjaekuk, lee <juku1999@samsung.com>
Fri, 23 Dec 2016 02:57:49 +0000 (11:57 +0900)
committerjaekuk, lee <juku1999@samsung.com>
Fri, 23 Dec 2016 02:57:49 +0000 (11:57 +0900)

Trivial merge