Merge heads

This commit is contained in:
youtaol
2012-06-05 16:51:53 +08:00
parent 953bd8b908
commit 04cc524bbb
131 changed files with 4865 additions and 692 deletions
@@ -275,7 +275,7 @@ public class MapFragment extends Fragment
break;
case NO_FIX:
case BAD_FIX:
messageId = R.string.gps_wait_for_fix;
messageId = R.string.gps_wait_for_signal;
isGpsDisabled = false;
break;
case GOOD_FIX: