Merge heads

This commit is contained in:
youtaol
2013-01-04 15:06:31 +08:00
parent f371e9e0e2
commit d7b4eeb05b
54 changed files with 703 additions and 2455 deletions
@@ -15,6 +15,8 @@
*/
package com.google.android.apps.mytracks.content;
import com.google.android.apps.mytracks.content.Waypoint.WaypointType;
import android.os.Parcel;
import android.os.Parcelable;
@@ -25,10 +27,6 @@ import android.os.Parcelable;
*/
public class WaypointCreationRequest implements Parcelable {
public static enum WaypointType {
WAYPOINT, STATISTICS;
}
private WaypointType type;
// true if this marker contains the track statistics
private boolean isTrackStatistics;