Jimmy Shih 707985a081 merge heads

2013-01-29 14:51:47 -08:00

..

.google_apis/drive-v2r30lv1.12.0-beta/drive

revert

2013-01-29 14:49:11 -08:00

.settings

revert

2013-01-29 14:49:11 -08:00

libs

revert

2013-01-29 14:49:11 -08:00

res

revert

2013-01-29 14:49:11 -08:00

src/com/google/android/apps/mytracks

revert

2013-01-29 14:49:11 -08:00

.classpath

revert

2013-01-29 14:49:11 -08:00

.project

revert

2013-01-29 14:49:11 -08:00

AndroidManifest.xml

revert

2013-01-29 14:49:11 -08:00

lint.xml

revert

2013-01-29 14:49:11 -08:00

MyTracks.launch

revert

2013-01-29 14:49:11 -08:00

proguard-google-api-client.txt

revert

2013-01-29 14:49:11 -08:00

proguard.cfg

revert

2013-01-29 14:49:11 -08:00

project.properties

revert

2013-01-29 14:49:11 -08:00