Merge branch 'tizen_30' into tizen_40
authorjaekuk, lee <juku1999@samsung.com>
Wed, 4 Jan 2017 02:17:26 +0000 (11:17 +0900)
committerjaekuk, lee <juku1999@samsung.com>
Wed, 4 Jan 2017 02:17:26 +0000 (11:17 +0900)

Trivial merge