Jimmy Shih a3e69df3ff merge heads

2012-04-11 10:11:53 -07:00

..

content

merge heads

2012-04-11 10:01:41 -07:00

fragments

merge heads

2012-04-11 10:11:53 -07:00

io

merge heads

2012-04-11 10:01:41 -07:00

maps

merge heads

2012-04-11 10:01:41 -07:00

services

merge heads

2012-04-11 10:01:41 -07:00

stats

merge heads

2012-04-11 10:01:41 -07:00

util

merge heads

2012-04-11 10:11:53 -07:00

widgets

merge heads

2012-04-11 10:01:41 -07:00

AggregatedStatsActivity.java

merge heads

2012-04-11 10:01:41 -07:00

AntPreference.java

merge heads

2012-04-11 10:01:41 -07:00

AutoCompleteTextPreference.java

merge heads

2012-04-11 10:01:41 -07:00

BootReceiver.java

merge heads

2012-04-11 10:01:41 -07:00

ChartFragment.java

merge heads

2012-04-11 10:01:41 -07:00

ChartValueSeries.java

merge heads

2012-04-11 10:01:41 -07:00

ChartView.java

merge heads

2012-04-11 10:01:41 -07:00

ColoredPath.java

merge heads

2012-04-11 10:01:41 -07:00

Constants.java

merge heads

2012-04-11 10:01:41 -07:00

ExportActivity.java

merge heads

2012-04-11 10:01:41 -07:00

ExportAsyncTask.java

merge heads

2012-04-11 10:01:41 -07:00

HelpActivity.java

merge heads

2012-04-11 10:11:53 -07:00

ImportActivity.java

merge heads

2012-04-11 10:01:41 -07:00

ImportAsyncTask.java

merge heads

2012-04-11 10:01:41 -07:00

IntegerListPreference.java

merge heads

2012-04-11 10:01:41 -07:00

MapFragment.java

merge heads

2012-04-11 10:01:41 -07:00

MapOverlay.java

merge heads

2012-04-11 10:01:41 -07:00

MyTracksApplication.java

merge heads

2012-04-11 10:01:41 -07:00

SearchActivity.java

merge heads

2012-04-11 10:01:41 -07:00

SensorStateActivity.java

merge heads

2012-04-11 10:01:41 -07:00

SettingsActivity.java

merge heads

2012-04-11 10:01:41 -07:00

StatsFragment.java

merge heads

2012-04-11 10:01:41 -07:00

StatsUtilities.java

merge heads

2012-04-11 10:01:41 -07:00

TabManager.java

merge heads

2012-04-11 10:01:41 -07:00

TrackDetailActivity.java

merge heads

2012-04-11 10:11:53 -07:00

TrackEditActivity.java

merge heads

2012-04-11 10:01:41 -07:00

TrackListActivity.java

merge heads

2012-04-11 10:11:53 -07:00

WaypointDetails.java

merge heads

2012-04-11 10:01:41 -07:00

WaypointsList.java

merge heads

2012-04-11 10:01:41 -07:00