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


Trivial merge