Merge branch 'origin/tizen_4.0' into tizen 37/170137/1
authorVikas Kumar Agrawal <vikas.ag@samsung.com>
Tue, 13 Feb 2018 14:51:37 +0000 (20:21 +0530)
committerVikas Kumar Agrawal <vikas.ag@samsung.com>
Tue, 13 Feb 2018 14:54:08 +0000 (20:24 +0530)
Change-Id: If8944908b8a873c21271cf0f8b6ad4e0df59ac1d


Trivial merge