[dali_1.1.11] Merge branch 'devel/master' 84/52284/1
authorRichard Huang <r.huang@samsung.com>
Fri, 20 Nov 2015 10:58:42 +0000 (10:58 +0000)
committerRichard Huang <r.huang@samsung.com>
Fri, 20 Nov 2015 10:58:42 +0000 (10:58 +0000)
commit408a61e446173b2ede857332db1c4587b3f4c230
treee14c71bad5b21c79b6ecfe59433bdb5ccb990091
parent7723d36f437a6aaa6867938a01ca961305fae454
parent2b0b030cdcfefcab61cbfce315543eba687af1ad
[dali_1.1.11] Merge branch 'devel/master'

Change-Id: I2f8dc25ac8abdf00cbcfc6a6e1f97e711a34635e