Jimmy Shih 63c1330f50 merge heads

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

..

content

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

fragments

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

io

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

maps

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

services

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

merge heads

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

testing

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

util

merge heads

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

BootReceiverTest.java

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

ChartValueSeriesTest.java

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

TrackStubUtils.java

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