Files
open-keychain/OpenKeychain/src/main/res
Vincent Breitmoser 5f20b8de1a Merge branch 'new-edit'
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
	OpenKeychain/src/main/res/values/strings.xml
2014-06-18 21:09:04 +02:00
..
2014-05-14 18:01:40 +02:00
2014-05-31 20:49:56 +02:00
2014-05-31 20:49:56 +02:00
2014-05-31 20:49:56 +02:00
2014-05-31 20:49:56 +02:00
2014-05-31 20:49:56 +02:00
2014-05-31 20:49:56 +02:00
2014-05-31 20:49:56 +02:00
2014-05-31 20:49:56 +02:00
2014-05-31 20:49:56 +02:00
2014-05-31 20:49:56 +02:00
2014-05-31 20:49:56 +02:00
2014-05-31 20:49:56 +02:00
2014-05-31 20:49:56 +02:00
2014-05-31 20:49:56 +02:00
2014-05-31 20:49:56 +02:00
2014-05-31 20:49:56 +02:00
2014-05-31 20:49:56 +02:00
2014-06-18 21:09:04 +02:00
2014-05-31 20:49:56 +02:00
2014-05-31 20:49:56 +02:00
2014-05-07 03:55:06 +02:00
2014-06-05 23:22:21 +02:00