Merge branch 'tizen_3.0' into tizen
authorGilbok Lee <gilbok.lee@samsung.com>
Tue, 13 Dec 2016 01:34:28 +0000 (10:34 +0900)
committerGilbok Lee <gilbok.lee@samsung.com>
Tue, 13 Dec 2016 01:34:38 +0000 (10:34 +0900)
Change-Id: I2d2d8d6148cfea3a652108c12f05513e1812f427


Trivial merge