7 Commits

Author	SHA1	Message	Date
Jimmy Shih	2c0515c597	Add back option to export to google drive	2013-11-27 10:45:07 -08:00
Jimmy Shih	be2d66d4ab	Revert menu icon color for froyo phones	2013-11-25 10:11:53 -08:00
Jimmy Shih	47c189409e	Add menu option for merge and play	2013-11-24 12:56:42 -08:00
Jimmy Shih	1e4451ce41	Prepend MyTracks to photo folder	2013-11-22 16:09:57 -08:00
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