Merge remote-tracking branch 'upstream/120202_as_task_activity_fix' into 4.0

pull/14/head
Sam Bosley 14 years ago
commit 9db456d18b

@ -522,7 +522,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
else if(!TextUtils.isEmpty(message) && !TextUtils.isEmpty(description)) else if(!TextUtils.isEmpty(message) && !TextUtils.isEmpty(description))
description += " " + message; description += " " + message;
else else
description = message; description += message;
if(TextUtils.isEmpty(description)) if(TextUtils.isEmpty(description))
return null; return null;

Loading…
Cancel
Save