Merge remote-tracking branch 'origin/kotlin' into kotlin

# Conflicts: # app/.gitignore
2025-12-10 02:45:20 +00:00 · 2021-03-06 20:31:08 +00:00
parent 04c3908bfc dabd1fe12e
commit beaabecd66
5 changed files with 0 additions and 1 deletions
--- a/app/release/app-release.apk
+++ b/app/release/app-release.apk
--- a/app/release/choice_cars.apk
+++ b/app/release/choice_cars.apk
--- a/app/release/choice_cars_1.3.apk
+++ b/app/release/choice_cars_1.3.apk
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +0,0 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":6,"versionName":"1.6","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
--- a/app/release/release/app.aab
+++ b/app/release/release/app.aab
				`@@ -1 +0,0 @@`
				`[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":6,"versionName":"1.6","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]`