canonicalize: missed two logging entries
fix key export
consistent button design in import activity
Merge branch 'master' of github.com:open-keychain/open-keychain
Fix new actionbar icon sizes, rename icon to ic_launcher following Android naming conventions
forward touch events to pager in import activity
decrease size of search icons in import
Reference ic_launcher instead of icon
remove obsolete subkey binding check from signature verification
New callback model for ImportKeysActivity
Merge branch 'master' of github.com:open-keychain/open-keychain
Remove unused code to import splitted qr codes
Fixing fingerprint search, part 1
Fix app name in PGP header, closing #663
Merge branch 'master' of https://github.com/open-keychain/open-keychain into improve-file