Merge branch 'tizen_3.0' into tizen 72/100672/1
authorGilbok Lee <gilbok.lee@samsung.com>
Tue, 29 Nov 2016 02:32:35 +0000 (11:32 +0900)
committerGilbok Lee <gilbok.lee@samsung.com>
Tue, 29 Nov 2016 02:32:48 +0000 (11:32 +0900)
Change-Id: If407217af026eeb619000723113755d781fc1e7a


Trivial merge