Merged to head

2011-11-14 23:27:04 -02:00
parent a4ae9e8fd5
commit c3cda97692
193 changed files with 8457 additions and 11274 deletions
@@ -4,7 +4,7 @@ syntax:glob
 */gen/**
 */proguard/**
 .metadata
-MyTracksTest/annotations.log
+MyTracksTest/AnnotationProcessor.log
 **/*.pyc
 **/*.pyo
 syntax: glob