Merge branch 'tizen_3.0' into tizen 10/115210/1
authorGilbok Lee <gilbok.lee@samsung.com>
Fri, 17 Feb 2017 02:11:46 +0000 (11:11 +0900)
committerGilbok Lee <gilbok.lee@samsung.com>
Fri, 17 Feb 2017 02:11:55 +0000 (11:11 +0900)
Change-Id: I1cf06543505cc008abee1bc6ec33e13b558257d1


Trivial merge