Merge branch 'devel/master' into tizen
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 20 Aug 2018 05:10:44 +0000 (14:10 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 20 Aug 2018 05:10:50 +0000 (14:10 +0900)
commit2e84c02f70ca2bf56d99ea31d0548eec0053bc42
tree8e315c536227f74c9200181a3a801897286e9837
parentb372836e95c6c11e431a7df224246d927a94de14
parent4d47c5c6c534627b9b41fdbe9a5e4d3332b540fa
Merge branch 'devel/master' into tizen

Change-Id: I58f83a9978a439df601a07b0815101f018c86457