aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/android
diff options
context:
space:
mode:
authorIshan Khanna <ishan1604@gmail.com>2015-03-04 02:20:08 +0530
committerIshan Khanna <ishan1604@gmail.com>2015-03-04 02:20:08 +0530
commitf3fd3c464c927ce099ede3bcc4dea16c68fc34fa (patch)
tree9adf6ffa0a5e9cd5652e2bc2417132c26e7010d7 /OpenKeychain/src/main/java/android
parentf5b877ca2208e0b9f14886c7f6011ffb55e6898e (diff)
parent5a4fc0a07127155f9c560374e65bf1373979d3ac (diff)
downloadopen-keychain-f3fd3c464c927ce099ede3bcc4dea16c68fc34fa.tar.gz
open-keychain-f3fd3c464c927ce099ede3bcc4dea16c68fc34fa.tar.bz2
open-keychain-f3fd3c464c927ce099ede3bcc4dea16c68fc34fa.zip
Merge remote-tracking branch 'upstream/development' into development
Diffstat (limited to 'OpenKeychain/src/main/java/android')
0 files changed, 0 insertions, 0 deletions