Vincent Breitmoser 9a1ce093bf Merge remote-tracking branch 'origin/master' ... Conflicts: OpenPGP-Keychain/src/main/res/menu/key_list_secret.xml		2014-03-13 13:40:47 +01:00
..
src/main	Merge remote-tracking branch 'origin/master'	2014-03-13 13:40:47 +01:00
.gitignore	New Gradle project structure	2014-01-27 14:18:25 +01:00
build.gradle	Lint changes after testing	2014-03-10 14:59:15 -04:00