Merge from head and address comment.

2011-01-04 21:00:12 -08:00
parent 868c1ef891
commit b0d6233de6
25 changed files with 352 additions and 132 deletions
@@ -2,5 +2,6 @@ syntax:glob

 */bin
 */gen/**
+*/proguard/**
 .metadata
 MyTracksTest/annotations.log