merge heads

2011-11-15 16:43:45 -08:00
parent 999285fcbc
commit ae28dc01fe
99 changed files with 4799 additions and 10962 deletions
@@ -177,7 +177,7 @@ public class StatsActivity extends Activity implements TrackDataListener {
      @Override
      public void run() {
        utils.updateUnits();
-        utils.setSpeedLabel(R.id.speed_label, R.string.speed, R.string.pace_label);
+        utils.setSpeedLabel(R.id.speed_label, R.string.stat_speed, R.string.stat_pace);
        utils.setSpeedLabels();
      }
    });