Jimmy Shih 986295c343 merge heads

2013-01-07 15:58:05 -08:00

..

.settings

Merge heads

2013-01-04 15:06:31 +08:00

libs

Add track category and marker category in KmlTrackWriter.

2012-12-21 13:34:48 -08:00

res

Add track category and marker category in KmlTrackWriter.

2012-12-21 13:34:48 -08:00

src/com/google/android/apps/mytracks/endtoendtest

merge heads

2013-01-07 15:58:05 -08:00

.classpath

Add track category and marker category in KmlTrackWriter.

2012-12-21 13:34:48 -08:00

.factorypath

Add track category and marker category in KmlTrackWriter.

2012-12-21 13:34:48 -08:00

.project

Add track category and marker category in KmlTrackWriter.

2012-12-21 13:34:48 -08:00

AndroidManifest.xml

Add track category and marker category in KmlTrackWriter.

2012-12-21 13:34:48 -08:00

lint.xml

Add track category and marker category in KmlTrackWriter.

2012-12-21 13:34:48 -08:00

MyTracksTests.launch

Add track category and marker category in KmlTrackWriter.

2012-12-21 13:34:48 -08:00

project.properties

Add track category and marker category in KmlTrackWriter.

2012-12-21 13:34:48 -08:00