Vincent Breitmoser 40703fe961 Merge branch 'master' into development ...

Conflicts:
	OpenKeychain/src/main/res/values/strings.xml

2015-05-28 16:37:15 +02:00

..

src/test

Merge branch 'master' into development

2015-05-28 16:37:15 +02:00

build.gradle

updated robolectric to support new android support libs

2015-05-03 14:06:01 -07:00