Merge branch 'tizen_30' into tizen_40 submit/tizen/20161219.103237 submit/tizen/20161219.103454
authorjaekuk, lee <juku1999@samsung.com>
Mon, 19 Dec 2016 10:32:25 +0000 (19:32 +0900)
committerjaekuk, lee <juku1999@samsung.com>
Mon, 19 Dec 2016 10:32:25 +0000 (19:32 +0900)

Trivial merge