Merge branch 'devel/master' into tizen 52/174052/1
authordongsug.song <dongsug.song@samsung.com>
Tue, 27 Mar 2018 13:48:03 +0000 (22:48 +0900)
committerdongsug.song <dongsug.song@samsung.com>
Tue, 27 Mar 2018 13:49:13 +0000 (22:49 +0900)
commit401e1083aed014c2d9ebcb83442acd95f897b4fe
treeeaae091627e6a54c588193811fa4f06c79cd8020
parent81843e71c74cb273253b63c12e5ef5333444172d
parent87824d37eca4732c88ce09da2728ad4baefe1b8b
Merge branch 'devel/master' into tizen

Conflicts:
packaging/dali-csharp-binder.spec

Change-Id: I651f001cf42b4993b72c528885aa739ed5cf855f