use hashcode instead of keyid in import list (keyids may not be unique!)
fix parcel method in ParcelableKeyRing
Merge remote-tracking branch 'origin/master'
fix indentation in various key import methods