Merge branch 'devel/master' into tizen
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 20 Aug 2018 05:18:00 +0000 (14:18 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 20 Aug 2018 05:18:03 +0000 (14:18 +0900)
commitb1f0e19e8e095303300b93035b7ce609734921eb
tree4cfe3d836b9bc1f89de28a208a93f8c88b57e22a
parentee7ca905fdccd9213874ca5ac9d0ec838137799c
parentcfe02c3a78dca41317cc41a1779aa9385b395779
Merge branch 'devel/master' into tizen

Change-Id: Ief7454e4e1d1604ddbbffd38ccbf8e4defc93b3b