fix git conflict

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

Author: alperozturk96

app/src/main/res/drawable/ic_translate.xml

@@ -1,3 +1,9 @@
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2025 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"

gradle/libs.versions.toml

@@ -5,7 +5,7 @@
 androidCommonLibraryVersion = "4fc0f29981"
 androidGifDrawableVersion = "1.2.30"
 androidImageCropperVersion = "4.7.0"
-androidLibraryVersion ="839366c261c52437425cde740c9e5a4ab8c8bace"
+androidLibraryVersion ="7db0d8d735"
 androidPluginVersion = "9.0.0"
 androidsvgVersion = "1.4"
 androidxMediaVersion = "1.5.1"