Vincent Breitmoser 71c53f13ec fix small merge conflict oversight

2014-12-30 16:24:20 +01:00

..

src/main

fix small merge conflict oversight

2014-12-30 16:24:20 +01:00

.gitignore

…

build.gradle

Add android-lockpattern library

2014-12-29 23:10:50 +01:00