Merge "Avoid overwriting TEXT with PLACEHOLDER_TEXT" into tizen
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 22 May 2015 15:20:52 +0000 (08:20 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Fri, 22 May 2015 15:20:52 +0000 (08:20 -0700)

Trivial merge