Merge " Calculate a new height when text was changed." into devel/master
authorJinho, Lee <jeano.lee@samsung.com>
Thu, 27 Jul 2017 10:41:59 +0000 (10:41 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Thu, 27 Jul 2017 10:42:00 +0000 (10:42 +0000)
commit8b3dac6e167dd77d6db17c019d1e9778d79f198e
tree391608ac843119adcc5418d17b1b2db7cf9bfd1e
parent24d391fe222bd0fd5910e3b3481124fa23b796be
parentd0d1c5d3cde438a08ccb78cc9c435edebfbd9717
Merge " Calculate a new height when text was changed." into devel/master
automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp
dali-toolkit/internal/text/text-controller.cpp