3 Commits

Author	SHA1	Message	Date
Jimmy Shih	74713239fb	list item, select entire item. not show markers in action bar. Message when photo marker is canceled	2013-11-22 10:37:20 -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