Vincent Breitmoser 5466d1e980 prevent recursive consolidate		2015-01-31 18:49:00 +01:00
..
src/main	prevent recursive consolidate	2015-01-31 18:49:00 +01:00
.gitignore	Fix gitignore for lint	2014-04-09 16:36:28 +02:00
build.gradle	Merge remote-tracking branch 'origin/t/snackbar' into development	2015-01-29 09:55:09 +01:00