Merge branch 'tizen' into tizen_4.0 31/148131/1 accepted/tizen/4.0/unified/20170907.195851 submit/tizen_4.0/20170907.015257
authorHaejeong Kim <backto.kim@samsung.com>
Thu, 7 Sep 2017 01:39:50 +0000 (10:39 +0900)
committerHaejeong Kim <backto.kim@samsung.com>
Thu, 7 Sep 2017 01:40:04 +0000 (10:40 +0900)
Change-Id: I2e9f70894fbd962a5ef45a68e8495a806a52e133


Trivial merge