Merge branch 'devel/master' into tizen
authorSunghyun kim <scholb.kim@samsung.com>
Mon, 2 Jul 2018 07:31:46 +0000 (16:31 +0900)
committerSunghyun kim <scholb.kim@samsung.com>
Mon, 2 Jul 2018 07:31:50 +0000 (16:31 +0900)
commit4f5f8ac6f1957b3fc23e1063882fe95b2dc9ab16
treec1ca8d6c4ccdc0970bbc5245b8aa9ed525449b56
parent6fe7d8ae1f183af0c9c0b9bdd1ee7a15b9f9a3b3
parent86c9fdbbb437a9e63599c65fc3dedd66994d1abe
Merge branch 'devel/master' into tizen

Change-Id: I22330a3e2612d10c4dfe54ee542ec90bc91e63ec