Merge branch 'tizen_30' into tizen_40
authorjaekuk, lee <juku1999@samsung.com>
Thu, 5 Jan 2017 04:46:05 +0000 (13:46 +0900)
committerjaekuk, lee <juku1999@samsung.com>
Thu, 5 Jan 2017 04:46:05 +0000 (13:46 +0900)

Trivial merge