[dali_1.1.34] Merge branch 'devel/master' 00/69500/1
authorFerran Sole <ferran.sole@samsung.com>
Fri, 13 May 2016 10:55:29 +0000 (11:55 +0100)
committerFerran Sole <ferran.sole@samsung.com>
Fri, 13 May 2016 10:55:29 +0000 (11:55 +0100)
commit4a0542cdee8fac2ef942fe1552fa14ae81f8dacb
tree04996aebbb15ead1623287cec44d0ff38bd165da
parent03d39591118c47c450740aad8a7186f7e65f05da
parent2d099c19344db0c99911d8199a8fbb0a928fbe49
[dali_1.1.34] Merge branch 'devel/master'

Change-Id: Ic465b246b9d29bf5d46aea73e10b9286d780c7c5