Merge branch 'tizen_30' into tizen_40 submit/tizen/20161220.064836
authorjaekuk, lee <juku1999@samsung.com>
Tue, 20 Dec 2016 06:48:17 +0000 (15:48 +0900)
committerjaekuk, lee <juku1999@samsung.com>
Tue, 20 Dec 2016 06:48:17 +0000 (15:48 +0900)

Trivial merge