# Conflicts: # src/net/micode/notes/gtask/data/MetaData.java # src/net/micode/notes/ui/AlarmAlertActivity.java # src/net/micode/notes/ui/NoteEditActivity.java # src/net/micode/notes/ui/NotesListActivity.java