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


Trivial merge