Jimmy Shih 0489582d7b merge heads

2012-03-23 10:44:06 -07:00

..

.settings

merge heads

2012-03-22 17:02:28 -07:00

libs

merge heads

2012-03-22 17:02:28 -07:00

src/com/google/android/apps/mytracks

merge heads

2012-03-22 17:02:28 -07:00

.classpath

update classpath for ADT 17

2012-03-23 10:43:52 -07:00

.factorypath

merge heads

2012-03-22 17:02:28 -07:00

.project

merge heads

2012-03-22 17:02:28 -07:00

AndroidManifest.xml

merge heads

2012-03-22 17:02:28 -07:00

lint.xml

merge heads

2012-03-22 17:02:28 -07:00

MyTracksTests.launch

merge heads

2012-03-22 17:02:28 -07:00

project.properties

merge heads

2012-03-22 17:02:28 -07:00