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)
Conflicts:
packaging/dali-csharp-binder.spec

Change-Id: I651f001cf42b4993b72c528885aa739ed5cf855f


Trivial merge