Merge branch 'tizen_3.0' into tizen 02/106702/1
authorGilbok Lee <gilbok.lee@samsung.com>
Thu, 22 Dec 2016 12:11:10 +0000 (21:11 +0900)
committerGilbok Lee <gilbok.lee@samsung.com>
Thu, 22 Dec 2016 12:11:16 +0000 (21:11 +0900)
Change-Id: I75f9c45ec6312579ceeb5c3d1a37b15300b0e525


Trivial merge