Merge branch 'tizen_3.0' into tizen
authorGilbok Lee <gilbok.lee@samsung.com>
Fri, 6 Jan 2017 05:14:49 +0000 (14:14 +0900)
committerGilbok Lee <gilbok.lee@samsung.com>
Fri, 6 Jan 2017 05:14:56 +0000 (14:14 +0900)
Change-Id: I58f65698977104ed2cd8b58e01d02bab05bd52a8


Trivial merge