Jimmy Shih 511dca70da merge heads

2013-08-22 15:29:53 -07:00

..

.google_apis

Add raw calories feature. Add calories column in Track table. Add calories field and raw logic to calculate calories in TripStatistics. Display a raw calories text in Stats Fragment.

2013-08-15 20:19:36 +08:00

.settings

Add raw calories feature. Add calories column in Track table. Add calories field and raw logic to calculate calories in TripStatistics. Display a raw calories text in Stats Fragment.

2013-08-15 20:19:36 +08:00

libs

Add raw calories feature. Add calories column in Track table. Add calories field and raw logic to calculate calories in TripStatistics. Display a raw calories text in Stats Fragment.

2013-08-15 20:19:36 +08:00

res

Merge heads

2013-08-22 10:14:45 +08:00

src/com/google/android/apps/mytracks

merge heads

2013-08-22 15:29:53 -07:00

.classpath

Add raw calories feature. Add calories column in Track table. Add calories field and raw logic to calculate calories in TripStatistics. Display a raw calories text in Stats Fragment.

2013-08-15 20:19:36 +08:00

.project

Add raw calories feature. Add calories column in Track table. Add calories field and raw logic to calculate calories in TripStatistics. Display a raw calories text in Stats Fragment.

2013-08-15 20:19:36 +08:00

AndroidManifest.xml

Add raw calories feature. Add calories column in Track table. Add calories field and raw logic to calculate calories in TripStatistics. Display a raw calories text in Stats Fragment.

2013-08-15 20:19:36 +08:00

lint.xml

Add raw calories feature. Add calories column in Track table. Add calories field and raw logic to calculate calories in TripStatistics. Display a raw calories text in Stats Fragment.

2013-08-15 20:19:36 +08:00

MyTracks.launch

Add raw calories feature. Add calories column in Track table. Add calories field and raw logic to calculate calories in TripStatistics. Display a raw calories text in Stats Fragment.

2013-08-15 20:19:36 +08:00

proguard-google-api-client.txt

Add raw calories feature. Add calories column in Track table. Add calories field and raw logic to calculate calories in TripStatistics. Display a raw calories text in Stats Fragment.

2013-08-15 20:19:36 +08:00

proguard.cfg

Add raw calories feature. Add calories column in Track table. Add calories field and raw logic to calculate calories in TripStatistics. Display a raw calories text in Stats Fragment.

2013-08-15 20:19:36 +08:00

project.properties

Add raw calories feature. Add calories column in Track table. Add calories field and raw logic to calculate calories in TripStatistics. Display a raw calories text in Stats Fragment.

2013-08-15 20:19:36 +08:00