4 Commits

Author	SHA1	Message	Date
Jimmy Shih	d52715c513	When in imperial unit, use 150 lb as the default	2013-12-05 13:05:53 -08:00
Jimmy Shih	9c4ccb2da9	Update gallery when photo markers are deleted	2013-12-02 15:50:08 -08:00
Jimmy Shih	63c1330f50	merge heads	2013-11-20 10:36:47 -08:00
Jimmy Shih	45909e70b6	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