Jimmy Shih 8337cda5b8 merge heads

2012-03-21 13:05:41 -07:00

..

.settings

Update About page and Terms of Service page for ICS.

2012-03-21 12:59:58 -07:00

libs

Update About page and Terms of Service page for ICS.

2012-03-21 12:59:58 -07:00

res

merge heads

2012-03-21 13:05:41 -07:00

src/com

merge heads

2012-03-21 13:05:41 -07:00

.classpath

Update About page and Terms of Service page for ICS.

2012-03-21 12:59:58 -07:00

.project

Update About page and Terms of Service page for ICS.

2012-03-21 12:59:58 -07:00

AndroidManifest.xml

Update About page and Terms of Service page for ICS.

2012-03-21 12:59:58 -07:00

lint.xml

Update About page and Terms of Service page for ICS.

2012-03-21 12:59:58 -07:00

MyTracks.launch

Update About page and Terms of Service page for ICS.

2012-03-21 12:59:58 -07:00

proguard.cfg

Update About page and Terms of Service page for ICS.

2012-03-21 12:59:58 -07:00

project.properties

Update About page and Terms of Service page for ICS.

2012-03-21 12:59:58 -07:00