(cherry picked from commit 8aa6486bf76ab9a61a5494bee284b1a5e9180bf3) # Conflicts: # app/build.gradle |
||
|---|---|---|
| .. | ||
| src | ||
| .gitignore | ||
| build.gradle | ||
| proguard-rules.pro | ||
| shortcuts.xml | ||
(cherry picked from commit 8aa6486bf76ab9a61a5494bee284b1a5e9180bf3) # Conflicts: # app/build.gradle |
||
|---|---|---|
| .. | ||
| src | ||
| .gitignore | ||
| build.gradle | ||
| proguard-rules.pro | ||
| shortcuts.xml | ||