[dali_1.2.6] Merge branch 'devel/master' 38/88338/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 16 Sep 2016 09:56:32 +0000 (10:56 +0100)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 16 Sep 2016 09:56:32 +0000 (10:56 +0100)
commit5c871f829de93f200bdcd47c1a80e3eee96b93cc
tree9632340062f753c5479ffa729ffae2aa8005d4f8
parent67599ff4ef2f566f532158645667a3849dccd503
parentd875885ef6cf1c721642b919d304fdfb8220db53
[dali_1.2.6] Merge branch 'devel/master'

Change-Id: I5b296d8836986f2d15c41e48d5a9cb3f5d181bdd