Lint changes after testing
Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychain
Merge remote-tracking branch 'upstream/master' into Lint-error-fix
Removing unused string
Removing tab
change colorizing of fingerprint to use SHA1 based on apg's commit 67ffc24526
Reduce library installation overhead
Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychain
Added Windows section to CheckStyle configuration information part (and splitted Linux and MacOSX up).
Merge pull request #406 from Emantor/tests_and_travis

Reduce travis library installation overhead
Merge pull request #405 from honnel/checkstyle

Checkstyle configuration information reworked
Merge pull request #404 from uberspot/master

Change colorizing of fingerprint to use SHA1 based on apg's commit 67ffc
Merge pull request #396 from bhargavgolla/Lint-error-fix

Lint error fix after testing
Export is cancellable now
Export cancellable - minor changes
Merge pull request #388 from ajit766/exportkeyfix

Export is cancellable now
Merge remote-tracking branch 'origin/master'

Conflicts:
	OpenPGP-Keychain/src/main/res/menu/key_list_secret.xml