[dali_1.2.27] Merge branch 'devel/master' 72/115372/1
authoradam.b <adam.b@samsung.com>
Fri, 17 Feb 2017 12:56:54 +0000 (12:56 +0000)
committeradam.b <adam.b@samsung.com>
Fri, 17 Feb 2017 12:56:54 +0000 (12:56 +0000)
Change-Id: I13590ea34a115d411e4ea61ede9db0c164163698


Trivial merge