Merge branch 'devel/master' into tizen 03/125403/1
authorJinho, Lee <jeano.lee@samsung.com>
Mon, 17 Apr 2017 04:02:46 +0000 (13:02 +0900)
committerJinho, Lee <jeano.lee@samsung.com>
Mon, 17 Apr 2017 04:03:37 +0000 (13:03 +0900)
commite21499bfd1aab63b4556c561c35763019190a7bd
treed51e3433be06ea2ea3e0d9df2067bff23bd22496
parentc73e548d7700a3051dab88dde891ba914052b93e
parentbd2d757678d8d92dd3f25101b9ad5fc34010ab09
Merge branch 'devel/master' into tizen

Change-Id: I17830031532b1e2e50880f456c81084bec30223d
dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp