Jimmy Shih 63c1330f50 merge heads

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

..

stats_content.xml

merge heads

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

track_controller.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_detail.xml

merge heads

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

track_list.xml

merge heads

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