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)
commitae643988e22f46fd0728e6327c1e537273269eb6
tree9c69073d2d6ea5ad1bd2451a3ecff6aa03acc5e5
parent68d45413e3807016df6a5b8db27f71008fe20b7b
parent8f97553fd7c63e1ae1625d560675201acf92c380
Merge "Avoid overwriting TEXT with PLACEHOLDER_TEXT" into tizen