Vincent Breitmoser 50e515c6cd add support for user attributes in merge() routine		2015-01-13 20:37:26 +01:00
..
src/main	add support for user attributes in merge() routine	2015-01-13 20:37:26 +01:00
.gitignore	Fix gitignore for lint	2014-04-09 16:36:28 +02:00
build.gradle	Add android-lockpattern library	2014-12-29 23:10:50 +01:00