3963191930
Conflicts: src/AndroidFileChooserBinding/AndroidFileChooserBinding.csproj src/AndroidFileChooserBinding/Transforms/Metadata.xml src/JavaFileStorageBindings/JavaFileStorageBindings.csproj src/KeePassLib2Android/KeePassLib2Android.csproj src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj src/java/InputStickAPI/gen/com/inputstick/api/R.java src/java/InputStickAPI/src/com/inputstick/api/BTConnectionManager.java src/java/InputStickAPI/src/com/inputstick/api/PacketManager.java src/java/InputStickAPI/src/com/inputstick/api/bluetooth/BTService.java src/java/InputStickAPI/src/com/inputstick/api/layout/KeyboardLayout.java src/java/InputStickAPI/src/com/inputstick/init/BasicInitManager.java src/java/InputStickAPI/src/com/inputstick/init/InitManager.java src/java/JavaFileStorage/bin/javafilestorage.jar src/java/KP2AKdbLibrary/bin/kp2akdblibrary.jar src/java/Keepass2AndroidPluginSDK/bin/keepass2androidpluginsdk.jar src/java/PluginInputStick/AndroidManifest.xml src/java/PluginInputStick/gen/com/inputstick/api/R.java src/java/PluginInputStick/gen/keepass2android/plugin/inputstick/R.java src/java/PluginInputStick/res/values/strings_activity_settings.xml src/java/PluginInputStick/src/keepass2android/plugin/inputstick/ActionReceiver.java src/keepass2android/PasswordActivity.cs src/keepass2android/Resources/Resource.designer.cs src/keepass2android/keepass2android.csproj