Jimmy Shih d3bc6ad77c merge heads

2012-02-29 15:20:18 -08:00

..

.settings

When sending to Google Docs, for elapsed time, always

2012-02-29 14:40:08 -08:00

libs

When sending to Google Docs, for elapsed time, always

2012-02-29 14:40:08 -08:00

res

When sending to Google Docs, for elapsed time, always

2012-02-29 14:40:08 -08:00

src/com

merge heads

2012-02-29 15:20:18 -08:00

.classpath

When sending to Google Docs, for elapsed time, always

2012-02-29 14:40:08 -08:00

.project

When sending to Google Docs, for elapsed time, always

2012-02-29 14:40:08 -08:00

AndroidManifest.xml

When sending to Google Docs, for elapsed time, always

2012-02-29 14:40:08 -08:00

lint.xml

When sending to Google Docs, for elapsed time, always

2012-02-29 14:40:08 -08:00

MyTracks.launch

When sending to Google Docs, for elapsed time, always

2012-02-29 14:40:08 -08:00

proguard.cfg

When sending to Google Docs, for elapsed time, always

2012-02-29 14:40:08 -08:00

project.properties

When sending to Google Docs, for elapsed time, always

2012-02-29 14:40:08 -08:00