(cherry picked from commit 6c9b9821046fb182bf54a308dd60ad91cca7686a) # Conflicts: # app/src/main/AndroidManifest.xml |
||
|---|---|---|
| .. | ||
| src | ||
| .gitignore | ||
| build.gradle | ||
| proguard-rules.pro | ||
| shortcuts.xml | ||
(cherry picked from commit 6c9b9821046fb182bf54a308dd60ad91cca7686a) # Conflicts: # app/src/main/AndroidManifest.xml |
||
|---|---|---|
| .. | ||
| src | ||
| .gitignore | ||
| build.gradle | ||
| proguard-rules.pro | ||
| shortcuts.xml | ||