Merge branch 'tizen_4.0' into tizen 68/185568/1
authorSunmin Lee <sunm.lee@samsung.com>
Mon, 23 Jul 2018 02:23:10 +0000 (11:23 +0900)
committerSunmin Lee <sunm.lee@samsung.com>
Mon, 23 Jul 2018 02:23:53 +0000 (11:23 +0900)
Change-Id: I16ff546419b6071204fb4fbeac4c7f4faca94bfa


Trivial merge