Merge branch 'devel/master' into tizen
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 19 Jun 2018 02:26:34 +0000 (11:26 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 19 Jun 2018 02:26:46 +0000 (11:26 +0900)
commit41e846919c314e3a0229c1f5324effd299037968
treee65a4a58ef8458abfb3713a9a6c34045c7cc75f4
parent38617c5785ff34d8a9f582c2ff16080100645bf5
parent927154b75d82c517d10c83ac9de35b473e435312
Merge branch 'devel/master' into tizen

Change-Id: I7c81da9ff622692089692721a9eda454e5f615c4