open-keychain/OpenKeychain/src/main/java
Vincent Breitmoser 54bc874ce5 Merge remote-tracking branch 'origin/master' into external-test
Conflicts:
	OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
2014-07-11 21:00:26 +02:00
..
android/support/v4/widget Add license header to FixedDrawerLayout 2014-05-18 23:23:58 +02:00
org/sufficientlysecure/keychain Merge remote-tracking branch 'origin/master' into external-test 2014-07-11 21:00:26 +02:00