diff options
| author | tdjogi010@gmail.com <tejasJOGI2@> | 2015-03-13 11:35:05 +0530 |
|---|---|---|
| committer | tdjogi010@gmail.com <tejasJOGI2@> | 2015-03-13 11:35:05 +0530 |
| commit | da3540805e4402067bdea9eff053f447543135e4 (patch) | |
| tree | c077244dedd0e27b1f8d6a67c89ee0569b7d0e41 /OpenKeychain/src/main/java/android/support | |
| parent | d56c90ce76236d94b14510d76cbb01bfad71d34f (diff) | |
| parent | 448797e6490bdec85916827f95ade24d4a69b200 (diff) | |
| download | open-keychain-da3540805e4402067bdea9eff053f447543135e4.tar.gz open-keychain-da3540805e4402067bdea9eff053f447543135e4.tar.bz2 open-keychain-da3540805e4402067bdea9eff053f447543135e4.zip | |
Merge branch 'development' of https://github.com/tdjogi010/open-keychain into development
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java
Diffstat (limited to 'OpenKeychain/src/main/java/android/support')
0 files changed, 0 insertions, 0 deletions