Merge branch 'tizen_30' into tizen_40 submit/tizen/20161220.022445
authorjaekuk, lee <juku1999@samsung.com>
Tue, 20 Dec 2016 02:24:15 +0000 (11:24 +0900)
committerjaekuk, lee <juku1999@samsung.com>
Tue, 20 Dec 2016 02:24:15 +0000 (11:24 +0900)

Trivial merge