merge heads

This commit is contained in:
Jimmy Shih
2012-04-06 10:55:58 -07:00
parent afa2dd2c0e
commit 6c7131f2a8
54 changed files with 1513 additions and 1543 deletions
@@ -31,9 +31,9 @@ import android.location.Location;
public class TrackStubUtils {
static final String LOCATION_PROVIDER = "gps";
static final double INITIAL_LATITUDE = 22;
static final double INITIAL_LONGITUDE = 22;
static final double INITIAL_ALTITUDE = 22;
public static final double INITIAL_LATITUDE = 22;
public static final double INITIAL_LONGITUDE = 22;
public static final double INITIAL_ALTITUDE = 22;
static final float INITIAL_ACCURACY = 5;
static final float INITIAL_SPEED = 10;
static final float INITIAL_BEARING = 3.0f;