Jimmy Shih 63c1330f50 merge heads

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

..

advanced_settings.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

backup_reset_settings.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

chart_settings.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

google_settings.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

map_settings.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

recording_settings.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

search.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

sensor_settings.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

settings.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

stats_settings.xml

merge heads

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

sync_adapter.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

track_widget_info.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