merge heads

This commit is contained in:
Jimmy Shih
2011-10-27 18:59:10 -07:00
parent dfc5d61514
commit d3ad49c4e1
37 changed files with 587 additions and 429 deletions
@@ -369,7 +369,7 @@ public class MyTracks extends TabActivity implements OnTouchListener {
try {
long waypointId = trackRecordingService.insertWaypoint(request);
if (waypointId >= 0) {
Toast.makeText(this, R.string.status_statistics_inserted,
Toast.makeText(this, R.string.status_marker_inserted,
Toast.LENGTH_LONG).show();
}
return waypointId;