Merge branch 'tizen' into tizen_3.0 94/103294/1
authorGeunsun, Lee <gs86.lee@samsung.com>
Thu, 8 Dec 2016 03:38:37 +0000 (12:38 +0900)
committerGeunsun, Lee <gs86.lee@samsung.com>
Thu, 8 Dec 2016 03:38:58 +0000 (12:38 +0900)
Change-Id: I14b3a25d2ef7f4a8573f4fcbccfc35ac6817a491


Trivial merge