Merge branch 'devel/master' into tizen accepted/tizen/unified/20180820.153932 submit/tizen/20180820.063034
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 20 Aug 2018 05:22:32 +0000 (14:22 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 20 Aug 2018 05:22:38 +0000 (14:22 +0900)
Change-Id: I58fdb611ea87ed85e119e6d4d45ff25882179a51


Trivial merge