Merge branch 'devel/master' into tizen
authorJoogab Yun <joogab.yun@samsung.com>
Mon, 9 Jul 2018 04:58:56 +0000 (13:58 +0900)
committerJoogab Yun <joogab.yun@samsung.com>
Mon, 9 Jul 2018 04:59:10 +0000 (13:59 +0900)
Change-Id: I4913edb8d49369f09eb3f705b64c9e8b0c3a0219


Trivial merge