Merge branch 'tizen' into tizen_4.0 24/147324/1 accepted/tizen/4.0/unified/20170904.143949 submit/tizen_4.0/20170904.045606
authorSomin Kim <somin926.kim@samsung.com>
Mon, 4 Sep 2017 03:24:46 +0000 (12:24 +0900)
committerSomin Kim <somin926.kim@samsung.com>
Mon, 4 Sep 2017 03:24:46 +0000 (12:24 +0900)
* tizen:
  Cherry pick from devel/tizen (Version 1.0.5)

Change-Id: I66b8dd5f25f8264f6c9a09be208ee26623d13447
Signed-off-by: Somin Kim <somin926.kim@samsung.com>

Trivial merge