(cherry picked from commit ac2df8795459ad625883849a53647f90e86fbe61) # Conflicts: # build.gradle.kts |
||
|---|---|---|
| .. | ||
| src | ||
| .gitignore | ||
| build.gradle | ||
| proguard-rules.pro | ||
| shortcuts.xml | ||
(cherry picked from commit ac2df8795459ad625883849a53647f90e86fbe61) # Conflicts: # build.gradle.kts |
||
|---|---|---|
| .. | ||
| src | ||
| .gitignore | ||
| build.gradle | ||
| proguard-rules.pro | ||
| shortcuts.xml | ||