[dali_1.2.23] Merge branch 'devel/master' 92/111492/1
authorRichard Huang <r.huang@samsung.com>
Fri, 20 Jan 2017 13:37:24 +0000 (13:37 +0000)
committerRichard Huang <r.huang@samsung.com>
Fri, 20 Jan 2017 13:37:24 +0000 (13:37 +0000)
Change-Id: I6233ca82bea0a578796c5f493539816ed793d2a5


Trivial merge