[dali_1.2.31] Merge branch 'devel/master' 29/119629/1
authorFrancisco Santos <f1.santos@samsung.com>
Fri, 17 Mar 2017 16:16:07 +0000 (16:16 +0000)
committerFrancisco Santos <f1.santos@samsung.com>
Fri, 17 Mar 2017 16:16:07 +0000 (16:16 +0000)
Change-Id: I0f26281aaa46476b1833f0f459fca6ed604a63eb


Trivial merge