(cherry picked from commit 436253dd63e07ffa5bbf5be98f5f844b2ca6fca5) # Conflicts: # app/src/main/res/values/strings.xml |
||
|---|---|---|
| .. | ||
| src | ||
| .gitignore | ||
| build.gradle | ||
| proguard-rules.pro | ||
| shortcuts.xml | ||
(cherry picked from commit 436253dd63e07ffa5bbf5be98f5f844b2ca6fca5) # Conflicts: # app/src/main/res/values/strings.xml |
||
|---|---|---|
| .. | ||
| src | ||
| .gitignore | ||
| build.gradle | ||
| proguard-rules.pro | ||
| shortcuts.xml | ||