merge heads

This commit is contained in:
Jimmy Shih
2011-10-21 16:16:01 -07:00
parent 1068b64b74
commit 66f41ca1ae
32 changed files with 970 additions and 230 deletions
@@ -62,7 +62,6 @@ public abstract class Constants {
public static final int MENU_MY_LOCATION = 1;
public static final int MENU_TOGGLE_LAYERS = 2;
public static final int MENU_CHART_SETTINGS = 3;
public static final int MENU_CURRENT_SEGMENT = 4;
/*
* Context menu ids: