Jimmy Shih 63c1330f50 merge heads

2013-11-20 10:36:47 -08:00

..

.settings

Update calorie when the activity type is set at the end of the track by the activity recognition api

2013-11-05 13:48:43 -08:00

libs

Update calorie when the activity type is set at the end of the track by the activity recognition api

2013-11-05 13:48:43 -08:00

proto

Update calorie when the activity type is set at the end of the track by the activity recognition api

2013-11-05 13:48:43 -08:00

res

Update calorie when the activity type is set at the end of the track by the activity recognition api

2013-11-05 13:48:43 -08:00

src/com/google/android/apps/mytracks

merge heads

2013-11-20 10:36:47 -08:00

.classpath

Update calorie when the activity type is set at the end of the track by the activity recognition api

2013-11-05 13:48:43 -08:00

.project

Update calorie when the activity type is set at the end of the track by the activity recognition api

2013-11-05 13:48:43 -08:00

AndroidManifest.xml

Update calorie when the activity type is set at the end of the track by the activity recognition api

2013-11-05 13:48:43 -08:00

lint.xml

Update calorie when the activity type is set at the end of the track by the activity recognition api

2013-11-05 13:48:43 -08:00

project.properties

Update calorie when the activity type is set at the end of the track by the activity recognition api

2013-11-05 13:48:43 -08:00