Merge branch 'devel/master' into tizen 85/181885/1
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 18 Jun 2018 12:39:15 +0000 (21:39 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 18 Jun 2018 12:39:22 +0000 (21:39 +0900)
commit4cbb7ce44a63c04349c3a07df856b03598d80871
treeebc51cbbf1e9284f01ed5398c0ade2ff82affe5b
parent3fc48c53660a3e5a653749f16ab0ed6c63648210
parent9f6631db37bdce7a2d8d000a4998d80d8d541514
Merge branch 'devel/master' into tizen

Change-Id: I459cf653f3096d4b88c172f7ceef8bfb676c5ab1